2.7.22

.github/workflows/preload-benchmark.yml

@@ -1,4 +1,5 @@
-# Paywall preload benchmark — runs on PRs into main or develop.
+# Paywall preload benchmark — opt-in only. Runs on PRs into main or develop
+# that carry the `release` or `benchmark` label, or on manual dispatch.
 #
 # Measures the time from Superwall.preloadAllPaywalls() until every paywall for
 # the dev app's embedded API key reaches PaywallLoadingState.Ready, on 3
@@ -19,14 +20,16 @@
 name: Paywall Preload Benchmark
 
 on:
-  # PRs into main (release) and develop (feature) both run the benchmark, so
-  # preload regressions surface before they land anywhere.
+  # PRs into main (release) and develop (feature) run the benchmark only when
+  # opted in with the `release` or `benchmark` label — it burns 3 emulators for
+  # up to 40 minutes, so it's not worth paying on every PR push. `labeled` is in
+  # the trigger list so adding the label to an open PR starts the run.
   pull_request:
     branches: [ main, develop ]
-  # Merges re-run the benchmark AND roll the baseline forward automatically,
-  # so release PRs always gate against the latest mainline numbers.
-  push:
-    branches: [ main, develop ]
+    types: [ opened, synchronize, reopened, labeled ]
+  # No push trigger: a merge into main/develop carries no labels, so it could
+  # never satisfy the opt-in. Roll the baseline forward with a manual dispatch
+  # (update_baseline: true) off the branch you want to become the new mainline.
   workflow_dispatch:
     inputs:
       update_baseline:
@@ -43,6 +46,13 @@ jobs:
   build-apks:
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    # Opt-in guard: PRs need the `release` or `benchmark` label; manual
+    # dispatches always run. The downstream jobs `needs` this one, so they skip
+    # with it.
+    if: >-
+      github.event_name == 'workflow_dispatch' ||
+      contains(github.event.pull_request.labels.*.name, 'release') ||
+      contains(github.event.pull_request.labels.*.name, 'benchmark')
 
     steps:
     - name: Checkout code
@@ -254,7 +264,7 @@ jobs:
           --config .benchmark/config.json \
           --report .benchmark/REPORT.md \
           --normalized-out .benchmark/results \
-          ${{ (github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.update_baseline)) && '--update-baseline' || '' }}
+          ${{ (github.event_name == 'workflow_dispatch' && inputs.update_baseline) && '--update-baseline' || '' }}
         echo "exit_code=$?" >> "$GITHUB_OUTPUT"
 
     - name: Publish report to job summary

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 The changelog for `Superwall`. Also see the [releases](https://github.com/superwall/Superwall-Android/releases) on GitHub.
 
+## 2.7.22
+
+## Enhancements
+- Always notify backend of purchased entitlements 
+- Adds a 5 second timeout to resolving latest purchases, allowing non-play store purchases to resolve
+
+## Fixes
+- Fix a dead buy button when re-presenting a cached paywall in the same session after a purchase, for both `register()` and embedded paywalls (`getPaywall`/`getPaywallView`). Per-presentation transient state (loading spinner and presentation-prepared flag) is now reset on each new presentation, so it no longer leaks from a previous presentation that was stopped without a finishing teardown.
+
 ## 2.7.21
 
 ## Enhancements

app/src/androidTest/java/com/example/superapp/test/PaywallHostFragment.kt

@@ -0,0 +1,82 @@
+package com.example.superapp.test
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import com.superwall.sdk.paywall.presentation.get_paywall.builder.PaywallBuilder
+import com.superwall.sdk.paywall.presentation.internal.state.PaywallResult
+import com.superwall.sdk.paywall.view.PaywallView
+import com.superwall.sdk.paywall.view.delegate.PaywallViewCallback
+import kotlinx.coroutines.launch
+
+/**
+ * Minimal test-host screen that EMBEDS a paywall inside a [Fragment] via the public
+ * embed API ([PaywallBuilder] -> [com.superwall.sdk.Superwall.getPaywall]), NOT via
+ * [com.superwall.sdk.paywall.presentation.register].
+ */
+class PaywallHostFragment : Fragment() {
+    // Parameterised so the whole flow keys off a single placement constant.
+    var placement: String = RepresentTests.CONSUMABLE_REBUY_PLACEMENT
+
+    private lateinit var container: FrameLayout
+    private var paywallView: PaywallView? = null
+
+    // Minimal embed delegate. The fragment host stays on screen so the test can
+    // re-embed the same paywall, so we intentionally do NOT finish the activity here.
+    private val delegate =
+        object : PaywallViewCallback {
+            override fun onFinished(
+                paywall: PaywallView,
+                result: PaywallResult,
+                shouldDismiss: Boolean,
+            ) {
+                // no-op: keep the host alive for re-embedding.
+            }
+        }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View = FrameLayout(requireContext()).also { this.container = it }
+
+    // NOTE: no auto-present on view-create. The SDK's config fetch is gated on the app
+    // being in the FOREGROUND (Network.getConfig -> awaitUntilAppInForeground), so the
+    // test must launch this host first, await Configured, and only then call [present].
+
+    /**
+     * Obtains the embedded paywall via the public [PaywallBuilder]/`getPaywall` API and
+     * attaches it into the fragment's container. On the second call the SDK reuses the
+     * CACHED `PaywallView` (via `PaywallManager.getPaywallView`'s cache-hit branch),
+     * which is precisely the path whose stale `LoadingPurchase` overlay used to swallow
+     * the buy tap before PR #434.
+     */
+    fun present() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            embedPaywall()
+        }
+    }
+
+    private suspend fun embedPaywall() {
+        // Detach any previously-embedded instance before re-embedding the (cached) view.
+        paywallView?.let { (it.parent as? ViewGroup)?.removeView(it) }
+
+        PaywallBuilder(placement)
+            .delegate(delegate)
+            .activity(requireActivity())
+            .build()
+            .onSuccess { view ->
+                paywallView = view
+                // `build()` already ran getPaywall() (cache-hit reset) + beforeViewCreated();
+                // ensure the view isn't still parented, attach it, then drive onViewCreated()
+                // as PaywallComposable does.
+                (view.parent as? ViewGroup)?.removeView(view)
+                container.addView(view)
+                view.onViewCreated()
+            }
+    }
+}