@virex-tech/paywallo-sdk 2.2.4 → 2.2.6

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/PaywalloEnvModule.kt

@@ -0,0 +1,31 @@
+package com.paywallo.sdk
+
+import com.facebook.react.bridge.*
+import android.os.Build
+
+class PaywalloEnvModule(private val reactContext: ReactApplicationContext) :
+    ReactContextBaseJavaModule(reactContext) {
+
+    override fun getName() = "PaywalloEnv"
+
+    @ReactMethod
+    fun detect(promise: Promise) {
+        try {
+            val packageName = reactContext.packageName
+            val packageManager = reactContext.packageManager
+            val installer = if (Build.VERSION.SDK_INT >= 30) {
+                packageManager.getInstallSourceInfo(packageName).installingPackageName
+            } else {
+                @Suppress("DEPRECATION")
+                packageManager.getInstallerPackageName(packageName)
+            }
+            if (installer == "com.android.vending") {
+                promise.resolve("production")
+            } else {
+                promise.resolve("sandbox")
+            }
+        } catch (e: Exception) {
+            promise.resolve("production")
+        }
+    }
+}

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/PaywalloSdkPackage.kt

@@ -12,7 +12,8 @@ class PaywalloSdkPackage : ReactPackage {
             PaywalloFBBridgeModule(reactContext),
             PaywalloStorageModule(reactContext),
             PaywalloDeviceModule(reactContext),
-            PaywalloNotificationsModule(reactContext)
+            PaywalloNotificationsModule(reactContext),
+            PaywalloEnvModule(reactContext)
         )
     }
 

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

@@ -307,6 +307,13 @@ interface PaywalloConfig {
     debug?: boolean;
     environment?: Environment;
     errorStrings?: PaywallErrorStrings$1;
+    /**
+     * App version reported to the server (used in event context.app_version
+     * and identify payload). When omitted, defaults to "unknown".
+     * Consumers should pass `Application.nativeApplicationVersion` (Expo)
+     * or `DeviceInfo.getVersion()` (bare RN) here.
+     */
+    appVersion?: string;
 }
 interface UserProperties {
     [key: string]: string | number | boolean | null;
@@ -387,12 +394,18 @@ interface EventContext {
     session_id?: string;
     device_id?: string;
     app_version?: string;
+    app_build?: string;
+    bundle_id?: string;
     sdk_version?: string;
     platform?: string;
     os_version?: string;
     device_model?: string;
     timezone?: string;
     locale?: string;
+    carrier?: string;
+    screen_width?: number;
+    screen_height?: number;
+    screen_density?: number;
     attribution?: Record<string, unknown>;
     ids?: Record<string, unknown>;
 }
@@ -721,7 +734,11 @@ interface FcmRemoteMessage {
     notification?: {
         title?: string;
         body?: string;
+        imageUrl?: string;
     };
+    title?: string;
+    body?: string;
+    imageUrl?: string;
     sentTime?: number;
 }
 /**
@@ -892,6 +909,7 @@ declare class NotificationsManager {
     private getDistinctId;
     private appKey;
     private apiBaseUrl;
+    private environment;
     private tokenRefreshCleanup;
     private foregroundCleanup;
     private pendingHandlersConfig;
@@ -906,6 +924,7 @@ declare class NotificationsManager {
         secureStorage: SecureStorage;
         getDeviceId: () => string | null;
         getDistinctId?: () => string;
+        environment?: "sandbox" | "production";
     }): void;
     initialize(config: NotificationsManagerConfig): Promise<void>;
     private applyConfig;

package/dist/index.d.ts

@@ -307,6 +307,13 @@ interface PaywalloConfig {
     debug?: boolean;
     environment?: Environment;
     errorStrings?: PaywallErrorStrings$1;
+    /**
+     * App version reported to the server (used in event context.app_version
+     * and identify payload). When omitted, defaults to "unknown".
+     * Consumers should pass `Application.nativeApplicationVersion` (Expo)
+     * or `DeviceInfo.getVersion()` (bare RN) here.
+     */
+    appVersion?: string;
 }
 interface UserProperties {
     [key: string]: string | number | boolean | null;
@@ -387,12 +394,18 @@ interface EventContext {
     session_id?: string;
     device_id?: string;
     app_version?: string;
+    app_build?: string;
+    bundle_id?: string;
     sdk_version?: string;
     platform?: string;
     os_version?: string;
     device_model?: string;
     timezone?: string;
     locale?: string;
+    carrier?: string;
+    screen_width?: number;
+    screen_height?: number;
+    screen_density?: number;
     attribution?: Record<string, unknown>;
     ids?: Record<string, unknown>;
 }
@@ -721,7 +734,11 @@ interface FcmRemoteMessage {
     notification?: {
         title?: string;
         body?: string;
+        imageUrl?: string;
     };
+    title?: string;
+    body?: string;
+    imageUrl?: string;
     sentTime?: number;
 }
 /**
@@ -892,6 +909,7 @@ declare class NotificationsManager {
     private getDistinctId;
     private appKey;
     private apiBaseUrl;
+    private environment;
     private tokenRefreshCleanup;
     private foregroundCleanup;
     private pendingHandlersConfig;
@@ -906,6 +924,7 @@ declare class NotificationsManager {
         secureStorage: SecureStorage;
         getDeviceId: () => string | null;
         getDistinctId?: () => string;
+        environment?: "sandbox" | "production";
     }): void;
     initialize(config: NotificationsManagerConfig): Promise<void>;
     private applyConfig;