2.8.5

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 The changelog for `Superwall`. Also see the [releases](https://github.com/superwall/Superwall-Android/releases) on GitHub.
 
+## 2.8.5
+
+## Enhancements
+- Adds the Customer Center, a self-service screen where users can view and restore their purchases, cancel or change a Google Play subscription, request a refund, manage a web subscription and contact support. Present it with `Superwall.instance.presentCustomerCenter()`, dismiss it with `Superwall.instance.dismissCustomerCenter()`, and configure it with `SuperwallOptions.customerCenter`.
+- Adds `CustomerCenterDelegate` and the `customerCenter_open`, `customerCenter_close`, `customerCenter_action`, `customerCenter_surveyResponse` and `customerCenter_refundRequest` events.
+
+## Fixes
+- Fix subscribers with an unexpired subscription being reported as inactive when Google Play fails to answer a purchase query, for example when the billing client isn't ready at launch. A query that succeeds and reports no purchases still deactivates straight away.
+- Fix subscribers being reported as inactive when Google Play returns an active purchase whose product no longer maps to an entitlement in config. A lost mapping is no longer treated as the subscription ending.
+- Fix purchases being refunded by Google Play for not being acknowledged when they did not complete through the billing flow callback, for example a pending purchase that settled while the app was closed, the app being killed mid-purchase, or a Play Store promo code. The `AutomaticPurchaseController` now acknowledges any unacknowledged purchase whenever it syncs the subscription status, including on launch, and retries acknowledgements that fail.
+- Fix `register()` never calling its handler, and every later placement stalling behind it, when a Google Play product query at launch was dropped. A request that found the billing client disconnected between being queued and running was discarded without a callback, leaving its products loading forever. Such requests are now re-queued until the client reconnects, a product query that Google Play never answers times out after 15 seconds, a disconnect with queued requests reconnects, and a second `startConnection` is no longer issued while one is in flight.
+- A paywall whose webview can't load, because every URL and retry has been used up or `paywalls.timeoutAfter` passed, is now dismissed as declined with the `webViewFailedToLoad` close reason, matching iOS. The register handler gets `onDismiss` and then the feature block for a non-gated placement, or `onError` for a gated one. Previously the paywall stayed on screen, and with `timeoutAfter` set the handler received `onPresent` followed by a bare `onError` while the paywall was still showing. A paywall that fails to load off-screen, for example during preload, reloads the next time it is presented.
+
 ## 2.8.4
 
 ## Fixes

app/src/main/java/com/superwall/superapp/test/TimelineViewerActivity.kt

@@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.HorizontalDivider
@@ -50,6 +51,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.sp
+import com.superwall.sdk.Superwall
 import com.superwall.sdk.analytics.superwall.SuperwallEvent
 import com.superwall.superapp.ui.theme.MyApplicationTheme
 import org.json.JSONArray
@@ -122,6 +124,17 @@ private fun TimelineListScreen(
             modifier = Modifier.padding(16.dp),
         )
 
+        Button(
+            onClick = { Superwall.instance.presentCustomerCenter() },
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp)
+                    .padding(bottom = 8.dp),
+        ) {
+            Text("Open Customer Center")
+        }
+
         if (timelines.isEmpty()) {
             Box(
                 modifier = Modifier.fillMaxSize(),

superwall/src/androidTest/java/com/superwall/sdk/billing/GoogleBillingWrapperTest.kt

@@ -25,6 +25,7 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.withContext
 import org.junit.After
@@ -229,8 +230,9 @@ class GoogleBillingWrapperTest {
                             runCatching { wrapper.awaitGetProducts(setOf("p1:base:sw-auto")) }
                         }
 
-                    // Advance so the async block runs and adds its request to the queue
-                    advanceUntilIdle()
+                    // runCurrent, not advanceUntilIdle: idling would run the product query timeout
+                    // before the setup result below is delivered.
+                    runCurrent()
 
                     capturedStateListener?.onBillingSetupFinished(
                         billingResult(BillingClient.BillingResponseCode.BILLING_UNAVAILABLE),
@@ -257,8 +259,9 @@ class GoogleBillingWrapperTest {
                             runCatching { wrapper.awaitGetProducts(setOf("p1:base:sw-auto")) }
                         }
 
-                    // Advance so the async block runs and adds its request to the queue
-                    advanceUntilIdle()
+                    // runCurrent, not advanceUntilIdle: idling would run the product query timeout
+                    // before the setup result below is delivered.
+                    runCurrent()
 
                     capturedStateListener?.onBillingSetupFinished(
                         billingResult(BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED),
@@ -387,11 +390,11 @@ class GoogleBillingWrapperTest {
         }
 
     // ========================================================================
-    // Region: Products cache — transient errors are not cached
+    // Region: Billing unavailable — later requests fail fast
     // ========================================================================
 
     @Test
-    fun test_billing_not_available_is_cached() =
+    fun test_billing_not_available_fails_later_requests_fast() =
         runTest {
             Given("a wrapper where billing is unavailable") {
                 val wrapper = createWrapper(clientReady = false)
@@ -402,8 +405,9 @@ class GoogleBillingWrapperTest {
                             runCatching { wrapper.awaitGetProducts(setOf("p1:base:sw-auto")) }
                         }
 
-                    // Advance so the async block runs and adds its request to the queue
-                    advanceUntilIdle()
+                    // runCurrent, not advanceUntilIdle: idling would run the product query timeout
+                    // before the setup result below is delivered.
+                    runCurrent()
 
                     capturedStateListener?.onBillingSetupFinished(
                         billingResult(BillingClient.BillingResponseCode.BILLING_UNAVAILABLE),
@@ -416,11 +420,11 @@ class GoogleBillingWrapperTest {
                         outcome1.exceptionOrNull() is BillingError.BillingNotAvailable,
                     )
 
-                    Then("a second call should fail immediately from cache without hitting billing") {
+                    Then("a second call should fail immediately without reconnecting") {
                         val outcome2 = runCatching { wrapper.awaitGetProducts(setOf("p1:base:sw-auto")) }
                         assertTrue("Second call should also fail", outcome2.isFailure)
                         assertTrue(
-                            "Should be BillingNotAvailable from cache",
+                            "Should be BillingNotAvailable",
                             outcome2.exceptionOrNull() is BillingError.BillingNotAvailable,
                         )
                     }
@@ -429,7 +433,7 @@ class GoogleBillingWrapperTest {
         }
 
     @Test
-    fun test_multiple_products_cached_on_billing_not_available() =
+    fun test_billing_not_available_fails_later_requests_for_any_product() =
         runTest {
             Given("multiple products that fail due to billing unavailable") {
                 val wrapper = createWrapper(clientReady = false)
@@ -442,20 +446,21 @@ class GoogleBillingWrapperTest {
                             runCatching { wrapper.awaitGetProducts(ids) }
                         }
 
-                    // Advance so the async block runs and adds its request to the queue
-                    advanceUntilIdle()
+                    // runCurrent, not advanceUntilIdle: idling would run the product query timeout
+                    // before the setup result below is delivered.
+                    runCurrent()
 
                     capturedStateListener?.onBillingSetupFinished(
                         billingResult(BillingClient.BillingResponseCode.BILLING_UNAVAILABLE),
                     )
 
                     assertTrue(result1.await().isFailure)
 
-                    Then("retrying any single product should fail from cache immediately") {
+                    Then("retrying any single product should fail immediately") {
                         val outcome = runCatching { wrapper.awaitGetProducts(setOf("p1:base:sw-auto")) }
                         assertTrue(outcome.isFailure)
                         assertTrue(
-                            "Should be a cached BillingNotAvailable error",
+                            "Should be BillingNotAvailable",
                             outcome.exceptionOrNull() is BillingError.BillingNotAvailable,
                         )
                     }
@@ -475,8 +480,9 @@ class GoogleBillingWrapperTest {
                             runCatching { wrapper.awaitGetProducts(setOf("p1:base:sw-auto")) }
                         }
 
-                    // Advance so the async block runs and adds its request to the queue
-                    advanceUntilIdle()
+                    // runCurrent, not advanceUntilIdle: idling would run the product query timeout
+                    // before the setup result below is delivered.
+                    runCurrent()
 
                     // SERVICE_UNAVAILABLE retries connection but does NOT drain requests
                     capturedStateListener?.onBillingSetupFinished(
@@ -495,11 +501,11 @@ class GoogleBillingWrapperTest {
                         outcome1.exceptionOrNull() is BillingError.BillingNotAvailable,
                     )
 
-                    Then("product is cached as BillingNotAvailable, second call fails from cache") {
+                    Then("billing is known to be unavailable, so a second call fails immediately") {
                         val outcome2 = runCatching { wrapper.awaitGetProducts(setOf("p1:base:sw-auto")) }
                         assertTrue("Second call should also fail", outcome2.isFailure)
                         assertTrue(
-                            "Should be BillingNotAvailable from cache",
+                            "Should be BillingNotAvailable",
                             outcome2.exceptionOrNull() is BillingError.BillingNotAvailable,
                         )
                     }
@@ -777,7 +783,7 @@ class GoogleBillingWrapperTest {
                             runCatching { wrapper.awaitGetProducts(setOf("p1:base:sw-auto")) }
                         }
 
-                    advanceUntilIdle()
+                    runCurrent()
 
                     capturedStateListener?.onBillingSetupFinished(
                         billingResult(
@@ -811,7 +817,7 @@ class GoogleBillingWrapperTest {
                         runCatching { wrapper.awaitGetProducts(setOf("p1:base:sw-auto")) }
                     }
 
-                advanceUntilIdle()
+                runCurrent()
 
                 When("SERVICE_UNAVAILABLE occurs (requests stay in queue)") {
                     capturedStateListener?.onBillingSetupFinished(

superwall/src/androidTest/java/com/superwall/sdk/config/ConfigManagerInstrumentedTest.kt

@@ -1,6 +1,5 @@
 package com.superwall.sdk.config
 
-import And
 import Given
 import Then
 import When
@@ -10,7 +9,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.superwall.sdk.Superwall
 import com.superwall.sdk.analytics.Tier
-import com.superwall.sdk.config.models.ConfigState
 import com.superwall.sdk.config.options.SuperwallOptions
 import com.superwall.sdk.dependencies.DependencyContainer
 import com.superwall.sdk.misc.Either