@virex-tech/paywallo-sdk 2.2.4 → 2.2.5

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath("com.android.tools.build:gradle:${safeExtGet('androidGradlePluginVersion', '7.4.2')}")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.9.22')}")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '2.0.21')}")
     }
 }
 
@@ -48,12 +48,14 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:+"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:${safeExtGet('kotlinVersion', '1.9.22')}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${safeExtGet('kotlinVersion', '2.0.21')}"
     implementation "com.android.billingclient:billing-ktx:7.0.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
     compileOnly "com.facebook.android:facebook-android-sdk:17.+"
     compileOnly "com.google.firebase:firebase-messaging:24.0.0"
-    implementation "androidx.security:security-crypto:1.0.0"
+    // 1.1.0+ required for MasterKey.Builder API used in PaywalloStorageModule.
+    // 1.0.0 only ships the deprecated MasterKeys.getOrCreate(...) static helper.
+    implementation "androidx.security:security-crypto:1.1.0"
     implementation "com.android.installreferrer:installreferrer:2.2"
 }

package/android/src/main/java/com/paywallo/sdk/PaywalloFirebaseMessagingService.kt

@@ -2,6 +2,7 @@ package com.paywallo.sdk
 
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.ReactApplication
@@ -46,10 +47,7 @@ class PaywalloFirebaseMessagingService : FirebaseMessagingService() {
 
     private fun emitEvent(eventName: String, data: WritableNativeMap) {
         try {
-            val reactContext = (application as? ReactApplication)
-                ?.reactNativeHost
-                ?.reactInstanceManager
-                ?.currentReactContext
+            val reactContext = resolveReactContext()
             if (reactContext != null) {
                 reactContext
                     .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
@@ -58,10 +56,40 @@ class PaywalloFirebaseMessagingService : FirebaseMessagingService() {
                 // Cold start: React context not ready — buffer for getInitialNotification()
                 pendingMessage = data
             }
-        } catch (_: Exception) {
+        } catch (_: Throwable) {
             if (eventName == MESSAGE_RECEIVED_EVENT) {
                 pendingMessage = data
             }
         }
     }
+
+    /**
+     * Resolves the active ReactContext across both architectures:
+     *   - New Architecture (bridgeless): ReactApplication.reactHost.currentReactContext
+     *   - Legacy bridge: ReactApplication.reactNativeHost.reactInstanceManager.currentReactContext
+     *
+     * Note: in the New Architecture, accessing `reactNativeHost` throws
+     * RuntimeException("You should not use ReactNativeHost directly in the New Architecture"),
+     * so we MUST try `reactHost` first and only fall back to the legacy path when reactHost is null.
+     * Each path is guarded by try/catch so a throw on one doesn't break the other.
+     */
+    private fun resolveReactContext(): ReactContext? {
+        val app = application as? ReactApplication ?: return null
+
+        // New Architecture path (RN 0.74+ bridgeless)
+        try {
+            val ctx = app.reactHost?.currentReactContext
+            if (ctx != null) return ctx
+        } catch (_: Throwable) {
+            // fall through to legacy
+        }
+
+        // Legacy bridge path (Old Architecture)
+        return try {
+            @Suppress("DEPRECATION")
+            app.reactNativeHost.reactInstanceManager.currentReactContext
+        } catch (_: Throwable) {
+            null
+        }
+    }
 }

package/android/src/main/java/com/paywallo/sdk/PaywalloNotificationsModule.kt

@@ -3,10 +3,10 @@ package com.paywallo.sdk
 import android.Manifest
 import android.content.pm.PackageManager
 import android.os.Build
-import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.facebook.react.bridge.*
-import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.facebook.react.modules.core.PermissionAwareActivity
+import com.facebook.react.modules.core.PermissionListener
 
 class PaywalloNotificationsModule(private val reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
@@ -14,26 +14,21 @@ class PaywalloNotificationsModule(private val reactContext: ReactApplicationCont
     private var permissionPromise: Promise? = null
     private val PERMISSION_REQUEST_CODE = 1001
 
-    private val activityEventListener = object : BaseActivityEventListener() {
-        override fun onRequestPermissionsResult(
-            requestCode: Int,
-            permissions: Array<out String>,
-            grantResults: IntArray
-        ) {
-            if (requestCode != PERMISSION_REQUEST_CODE) return
-            val promise = permissionPromise ?: return
-            permissionPromise = null
+    private val permissionListener = PermissionListener { requestCode, _, grantResults ->
+        if (requestCode != PERMISSION_REQUEST_CODE) {
+            return@PermissionListener false
+        }
+        val promise = permissionPromise
+        permissionPromise = null
 
+        if (promise != null) {
             if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 promise.resolve("granted")
             } else {
                 promise.resolve("denied")
             }
         }
-    }
-
-    init {
-        reactContext.addActivityEventListener(activityEventListener)
+        true
     }
 
     override fun getName() = "PaywalloNotifications"
@@ -79,7 +74,10 @@ class PaywalloNotificationsModule(private val reactContext: ReactApplicationCont
     fun requestPermission(options: ReadableMap?, promise: Promise) {
         // Android 13+ (API 33) requires POST_NOTIFICATIONS runtime permission
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            val activity = currentActivity
+            // RN 0.80+ removed the synthetic `currentActivity` property on
+            // ReactContextBaseJavaModule (base class was rewritten in Kotlin).
+            // Reach it via the ReactContext, which is still Java-backed.
+            val activity = reactContext.currentActivity
             if (activity == null) {
                 promise.resolve("denied")
                 return
@@ -90,23 +88,41 @@ class PaywalloNotificationsModule(private val reactContext: ReactApplicationCont
 
             if (granted) {
                 promise.resolve("granted")
-            } else {
-                // If there's already a pending promise, reject it before storing the new one
-                permissionPromise?.reject("PERMISSION_SUPERSEDED", "New permission request superseded this one")
-                // Store promise and wait for onRequestPermissionsResult callback
-                permissionPromise = promise
-                ActivityCompat.requestPermissions(
-                    activity,
-                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                    PERMISSION_REQUEST_CODE
-                )
+                return
+            }
+
+            val permissionAware = activity as? PermissionAwareActivity
+            if (permissionAware == null) {
+                promise.resolve("denied")
+                return
             }
+
+            // If there's already a pending promise, reject it before storing the new one
+            permissionPromise?.reject("PERMISSION_SUPERSEDED", "New permission request superseded this one")
+            // Store promise and wait for permission listener callback
+            permissionPromise = promise
+            permissionAware.requestPermissions(
+                arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                PERMISSION_REQUEST_CODE,
+                permissionListener
+            )
         } else {
             // Pre-Android 13: notifications always allowed
             promise.resolve("granted")
         }
     }
 
+    // iOS calls UIApplication.registerForRemoteNotifications() here to obtain
+    // an APNS token. On Android there's no equivalent: FCM tokens are minted
+    // automatically by Firebase and surfaced via FirebaseMessagingService.onNewToken.
+    // Exposing this as a no-op keeps the cross-platform bridge contract and
+    // silences the "method not found" warning from NativeModules when the JS
+    // bridge calls it after permission is granted.
+    @ReactMethod
+    fun registerForPush(promise: Promise) {
+        promise.resolve(null)
+    }
+
     @ReactMethod
     fun hasPermission(promise: Promise) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -130,7 +146,7 @@ class PaywalloNotificationsModule(private val reactContext: ReactApplicationCont
         }
 
         // Check if the app was opened from a notification tap
-        val activity = currentActivity
+        val activity = reactContext.currentActivity
         val intent = activity?.intent
         val extras = intent?.extras
 
@@ -161,9 +177,10 @@ class PaywalloNotificationsModule(private val reactContext: ReactApplicationCont
         }
     }
 
-    override fun onCatalystInstanceDestroy() {
-        reactContext.removeActivityEventListener(activityEventListener)
+    // invalidate() is the post-TurboModule replacement for onCatalystInstanceDestroy.
+    // The latter is @Deprecated(forRemoval = true) since RN 0.74 and will be removed.
+    override fun invalidate() {
         permissionPromise = null
-        super.onCatalystInstanceDestroy()
+        super.invalidate()
     }
 }

package/android/src/main/java/com/paywallo/sdk/PaywalloStoreKitModule.kt

@@ -195,7 +195,9 @@ class PaywalloStoreKitModule(private val reactContext: ReactApplicationContext)
                 }
 
                 val client = billingClient!!
-                val activity = currentActivity
+                // RN 0.80+ removed the synthetic `currentActivity` property on
+                // ReactContextBaseJavaModule. Reach it via ReactContext instead.
+                val activity = reactContext.currentActivity
 
                 if (activity == null) {
                     promise.reject("NO_ACTIVITY", "No current activity")
@@ -427,13 +429,15 @@ class PaywalloStoreKitModule(private val reactContext: ReactApplicationContext)
         }
     }
 
-    override fun onCatalystInstanceDestroy() {
+    // invalidate() is the post-TurboModule replacement for onCatalystInstanceDestroy.
+    // The latter is @Deprecated(forRemoval = true) since RN 0.74 and will be removed.
+    override fun invalidate() {
         // Reject any pending purchase promise so the JS side doesn't hang forever
         purchasePromise?.reject("MODULE_DESTROYED", "Module was destroyed before purchase completed")
         purchasePromise = null
         scope.cancel()
         billingClient?.endConnection()
         billingClient = null
-        super.onCatalystInstanceDestroy()
+        super.invalidate()
     }
 }

package/android/src/main/java/com/paywallo/sdk/PaywalloWebViewEvent.kt

@@ -10,11 +10,13 @@ import com.facebook.react.uimanager.events.Event
 class PaywalloWebViewEvent(
     surfaceId: Int,
     viewId: Int,
-    private val eventName: String,
+    // RN 0.81 `Event.eventName` is now an open `val` on the base class.
+    // Using `eventName` as a constructor parameter would shadow it.
+    private val name: String,
     private val payload: WritableMap
 ) : Event<PaywalloWebViewEvent>(surfaceId, viewId) {
 
-    override fun getEventName(): String = eventName
+    override fun getEventName(): String = name
 
     override fun getEventData(): WritableMap = payload
 }

package/dist/index.d.mts

@@ -721,7 +721,11 @@ interface FcmRemoteMessage {
     notification?: {
         title?: string;
         body?: string;
+        imageUrl?: string;
     };
+    title?: string;
+    body?: string;
+    imageUrl?: string;
     sentTime?: number;
 }
 /**

package/dist/index.d.ts

@@ -721,7 +721,11 @@ interface FcmRemoteMessage {
     notification?: {
         title?: string;
         body?: string;
+        imageUrl?: string;
     };
+    title?: string;
+    body?: string;
+    imageUrl?: string;
     sentTime?: number;
 }
 /**

package/dist/index.js

@@ -2024,13 +2024,21 @@ var init_NativePushBridge = __esm({
           if (!raw || typeof raw !== "object") return null;
           const r = raw;
           const notification = r["notification"];
+          const asString = (v) => typeof v === "string" ? v : void 0;
           return {
-            messageId: typeof r["messageId"] === "string" ? r["messageId"] : void 0,
+            messageId: asString(r["messageId"]),
             data: typeof r["data"] === "object" && r["data"] !== null ? r["data"] : void 0,
             notification: notification && typeof notification === "object" ? {
-              title: typeof notification["title"] === "string" ? notification["title"] : void 0,
-              body: typeof notification["body"] === "string" ? notification["body"] : void 0
+              title: asString(notification["title"]),
+              body: asString(notification["body"]),
+              imageUrl: asString(notification["imageUrl"])
             } : void 0,
+            // Pass through top-level title/body/imageUrl emitted by the native modules
+            // (both iOS and Android currently emit these at the top level rather than
+            // nested under `notification`).
+            title: asString(r["title"]),
+            body: asString(r["body"]),
+            imageUrl: asString(r["imageUrl"]),
             sentTime: typeof r["sentTime"] === "number" ? r["sentTime"] : void 0
           };
         } catch {
@@ -2169,8 +2177,9 @@ function setupForegroundHandler(deps, onReceive) {
     const data = message.data ?? {};
     const payload = extractPayload({
       ...data,
-      title: data["title"] ?? message.notification?.title ?? "",
-      body: data["body"] ?? message.notification?.body ?? ""
+      title: data["title"] ?? message.notification?.title ?? message.title ?? "",
+      body: data["body"] ?? message.notification?.body ?? message.body ?? "",
+      imageUrl: data["imageUrl"] ?? message.notification?.imageUrl ?? message.imageUrl
     });
     if (debug) console.log("[Paywallo PUSH] foreground message received:", payload.notificationId);
     onReceive(payload);
@@ -2361,8 +2370,8 @@ async function getInitialNotificationPayload(bridge) {
     notificationId: String(data["notificationId"] ?? data["notification_id"] ?? ""),
     campaignId: String(data["campaignId"] ?? data["campaign_id"] ?? ""),
     variantKey: data["variantKey"] != null ? String(data["variantKey"]) : void 0,
-    title: String(data["title"] ?? message.notification?.title ?? ""),
-    body: String(data["body"] ?? message.notification?.body ?? ""),
+    title: String(data["title"] ?? message.notification?.title ?? message.title ?? ""),
+    body: String(data["body"] ?? message.notification?.body ?? message.body ?? ""),
     data
   };
 }
@@ -2377,8 +2386,8 @@ var init_NotificationHandlerSetup = __esm({
 // src/core/version.ts
 function resolveVersion() {
   try {
-    if ("2.2.4") {
-      return "2.2.4";
+    if ("2.2.5") {
+      return "2.2.5";
     }
   } catch {
   }
@@ -4723,12 +4732,24 @@ var init_QueueProcessor = __esm({
           const freshHeaders = this.config.getFreshHeaders?.() ?? {};
           const headers = { ...persistedHeaders, ...freshHeaders };
           this.log("Sending event batch", { size: batch.length, batchIndex: Math.floor(i / BATCH_SIZE) });
-          const response = await this.httpClient.request("/sdk/ingest/batch", {
-            method: "POST",
-            body: { events: bodies },
-            headers,
-            skipRetry: false
-          });
+          let response;
+          try {
+            response = await this.httpClient.request("/sdk/ingest/batch", {
+              method: "POST",
+              body: { events: bodies },
+              headers,
+              skipRetry: false
+            });
+          } catch (error) {
+            for (const item of batch) {
+              retryIds.add(item.id);
+            }
+            this.log("Event batch threw network error - will retry", {
+              size: batch.length,
+              error: error instanceof Error ? error.message : String(error)
+            });
+            continue;
+          }
           if (response.ok) {
             for (const item of batch) {
               await offlineQueue.removeItem(item.id);
@@ -4768,12 +4789,21 @@ var init_QueueProcessor = __esm({
         });
         const persistedHeaders = item.headers ?? {};
         const freshHeaders = this.config.getFreshHeaders?.() ?? {};
-        const response = await this.httpClient.request(item.url, {
-          method: item.method,
-          body: item.body,
-          headers: { ...persistedHeaders, ...freshHeaders },
-          skipRetry: false
-        });
+        let response;
+        try {
+          response = await this.httpClient.request(item.url, {
+            method: item.method,
+            body: item.body,
+            headers: { ...persistedHeaders, ...freshHeaders },
+            skipRetry: false
+          });
+        } catch (error) {
+          this.log("Request threw network error - will retry", {
+            id: item.id,
+            error: error instanceof Error ? error.message : String(error)
+          });
+          return { success: false, permanent: false };
+        }
         if (response.ok) {
           this.log("Queue item processed successfully", { id: item.id });
           return { success: true, permanent: false };