Merge pull request #403 from superwall/develop

4.11.1

Author: yusuftor

CHANGELOG.md

@@ -2,14 +2,21 @@
 
 The changelog for `SuperwallKit`. Also see the [releases](https://github.com/superwall/Superwall-iOS/releases) on GitHub.
 
+## 4.11.1
+
+### Fixes
+
+- Fixes issue where `isApplePayAvailable` being calculated off the main thread could cause a crash.
+- Fixes potential crashes in WebKit navigation delegate methods. 
+
 ## 4.11.0
 
 ### Enhancements
 
 - Adds the ability to override introductory offer eligibility via the paywall editor.
 - Adds dynamic notification support and scheduling.
 - Adds `refreshConfiguration()` to manually refresh the SDK configuration. This should only be used in wrapper SDKs in development for hot reloading.
-- Adds `offerType`, `subscriptionGroupId` and `store` to SubscriptionTransaction` and `NonSubscriptionTransaction`.
+- Adds `offerType`, `subscriptionGroupId` and `store` to `SubscriptionTransaction` and `NonSubscriptionTransaction`.
 
 ### Fixes
 

Sources/SuperwallKit/Misc/Constants.swift

@@ -18,5 +18,5 @@ let sdkVersion = """
 */
 
 let sdkVersion = """
-4.11.0
+4.11.1
 """

Sources/SuperwallKit/Misc/DispatchQueueBacked.swift

@@ -21,9 +21,7 @@ public final class DispatchQueueBacked<T>: @unchecked Sendable {
 
   public var wrappedValue: T {
     get {
-      queue.sync {
-        value
-      }
+      queue.sync { value }
     }
     set {
       queue.async { [weak self] in
@@ -42,3 +40,14 @@ public final class DispatchQueueBacked<T>: @unchecked Sendable {
     }
   }
 }
+
+extension DispatchQueueBacked where T == Bool {
+  /// Returns `true` if already handled, otherwise marks handled and returns `false`.
+  func testAndSetTrue() -> Bool {
+    queue.sync {
+      if value { return true }
+      value = true
+      return false
+    }
+  }
+}

Sources/SuperwallKit/Network/Device Helper/DeviceHelper.swift

@@ -173,84 +173,24 @@ class DeviceHelper {
     return ProcessInfo.processInfo.isLowPowerModeEnabled ? "true" : "false"
   }
 
-  var isApplePayAvailable: Bool {
-    var networks: [PKPaymentNetwork] = [
-      .amex,
-      .cartesBancaires,
-      .chinaUnionPay,
-      .discover,
-      .eftpos,
-      .electron,
-      .elo,
-      .idCredit,
-      .interac,
-      .JCB,
-      .mada,
-      .maestro,
-      .masterCard,
-      .privateLabel,
-      .quicPay,
-      .suica,
-      .visa,
-      .vPay
-    ]
-    if #available(iOS 14.0, *) {
-      networks += [.barcode, .girocard]
-    }
-    if #available(iOS 14.5, *) {
-      networks += [.mir]
-    }
-
-    if #available(iOS 15.0, *) {
-      networks += [.nanaco]
-    }
-    if #available(iOS 15.1, *) {
-      networks += [.dankort]
-    }
-
-    #if compiler(>=5.7)
-    if #available(iOS 16.0, *) {
-      networks += [.bancomat, .nanaco, .waon]
-    }
-    #endif
-
-    #if compiler(>=5.8)
-    if #available(iOS 16.4, *) {
-      networks += [.postFinance]
-    }
-    #endif
-
-    #if compiler(>=5.9)
-    if #available(iOS 17.0, *) {
-      networks += [.tmoney, .pagoBancomat]
-    }
-    #endif
-
-    #if compiler(>=5.10)
-    if #available(iOS 17.4, visionOS 1.1, *) {
-      networks += [.meeza]
-    }
-
-    if #available(iOS 17.5, visionOS 1.2, *) {
-      networks += [.bankAxept, .NAPAS]
-    }
-    #endif
+  @DispatchQueueBacked
+  private var cachedIsApplePayAvailable: Bool?
 
-    #if compiler(>=6.1)
-    if #available(iOS 18.4, visionOS 2.4, *) {
-      networks += [.himyan, .jaywan]
+  func getIsApplePayAvailable() async -> Bool {
+    if let cached = cachedIsApplePayAvailable {
+      return cached
     }
-    #endif
 
-    #if compiler(>=6.2)
-    if #available(iOS 26.0, visionOS 26.0, *) {
-      networks += [.myDebit]
+    let result = await MainActor.run {
+      guard PKPaymentAuthorizationViewController.canMakePayments() else {
+        return false
+      }
+      let availableNetworks = PKPaymentRequest.availableNetworks()
+      return PKPaymentAuthorizationViewController.canMakePayments(usingNetworks: availableNetworks)
     }
-    #endif
 
-    return PKPaymentAuthorizationViewController.canMakePayments(
-      usingNetworks: networks
-    )
+    cachedIsApplePayAvailable = result
+    return result
   }
 
   let bundleId: String = {
@@ -623,7 +563,7 @@ class DeviceHelper {
       radioType: radioType,
       interfaceStyle: interfaceStyle,
       isLowPowerModeEnabled: isLowPowerModeEnabled == "true",
-      isApplePayAvailable: isApplePayAvailable,
+      isApplePayAvailable: await getIsApplePayAvailable(),
       bundleId: bundleId,
       appInstallDate: appInstalledAtString,
       isMac: isMac,

Sources/SuperwallKit/Paywall/View Controller/CheckoutWebViewController.swift

@@ -14,6 +14,7 @@ final class CheckoutWebViewController: UIViewController {
   private let webView: WKWebView
   private let url: URL
   var onDismiss: (() -> Void)?
+  @DispatchQueueBacked
   var hasHandledRedemption = false
 
   deinit {
@@ -209,27 +210,28 @@ final class CheckoutWebViewController: UIViewController {
 extension CheckoutWebViewController: WKNavigationDelegate {
   func webView(
     _ webView: WKWebView,
-    decidePolicyFor navigationAction: WKNavigationAction
-  ) async -> WKNavigationActionPolicy {
+    decidePolicyFor navigationAction: WKNavigationAction,
+    decisionHandler: @escaping (WKNavigationActionPolicy) -> Void
+  ) {
     guard let url = navigationAction.request.url else {
-      return .allow
+      decisionHandler(.allow)
+      return
     }
 
     // Block Superwall deep links from checkout to prevent duplicate redemptions
     if url.isSuperwallDeepLink {
-      if hasHandledRedemption {
-        return .cancel
+      if $hasHandledRedemption.testAndSetTrue() {
+        decisionHandler(.cancel)
+        return
       }
 
-      hasHandledRedemption = true
-      await MainActor.run {
-        _ = Superwall.shared.dependencyContainer.deepLinkRouter.route(url: url)
-      }
-      return .cancel
+      _ = Superwall.shared.dependencyContainer.deepLinkRouter.route(url: url)
+      decisionHandler(.cancel)
+      return
     }
 
     // Allow all other navigation types for payment flows and SSO authentication
-    return .allow
+    decisionHandler(.allow)
   }
 
   func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {

Sources/SuperwallKit/Paywall/View Controller/Web View/SWWebView.swift

@@ -190,37 +190,44 @@ extension SWWebView: SWWebViewLoadingDelegate {
 extension SWWebView: WKNavigationDelegate {
   func webView(
     _ webView: WKWebView,
-    decidePolicyFor navigationResponse: WKNavigationResponse
-  ) async -> WKNavigationResponsePolicy {
+    decidePolicyFor navigationResponse: WKNavigationResponse,
+    decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void
+  ) {
     guard let statusCode = (navigationResponse.response as? HTTPURLResponse)?.statusCode else {
       // if there's no http status code to act on, exit and allow navigation
-      return .allow
+      decisionHandler(.allow)
+      return
     }
 
     // Track paywall errors
     if statusCode >= 400 {
       completion?(WebViewError.network(statusCode))
-      return .cancel
+      decisionHandler(.cancel)
+      return
     }
 
-    return .allow
+    decisionHandler(.allow)
   }
 
   func webView(
     _ webView: WKWebView,
-    decidePolicyFor navigationAction: WKNavigationAction
-  ) async -> WKNavigationActionPolicy {
+    decidePolicyFor navigationAction: WKNavigationAction,
+    decisionHandler: @escaping (WKNavigationActionPolicy) -> Void
+  ) {
     if webView.isLoading {
-      return .allow
+      decisionHandler(.allow)
+      return
     }
     if navigationAction.navigationType == .reload {
-      return .allow
+      decisionHandler(.allow)
+      return
     }
     if enableIframeNavigation,
       navigationAction.targetFrame?.isMainFrame == false {
-      return .allow
+      decisionHandler(.allow)
+      return
     }
-    return .cancel
+    decisionHandler(.cancel)
   }
 
   func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {

SuperwallKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 	s.name         = "SuperwallKit"
-  s.version      = "4.11.0"
+  s.version      = "4.11.1"
 	s.summary      = "Superwall: In-App Paywalls Made Easy"
 	s.description  = "Paywall infrastructure for mobile apps :) we make things like editing your paywall and running price tests as easy as clicking a few buttons. superwall.com"