@apex-inc/capacitor-plugin 2.2.5 → 2.2.6

package/android/src/main/java/inc/apex/capacitor/ApexCapacitorPlugin.kt

@@ -14,6 +14,7 @@ import com.getcapacitor.PluginMethod
 import com.getcapacitor.annotation.CapacitorPlugin
 import com.google.android.gms.ads.identifier.AdvertisingIdClient
 import com.google.firebase.messaging.FirebaseMessaging
+import org.json.JSONObject
 import java.io.File
 import java.util.Locale
 import java.util.TimeZone
@@ -373,7 +374,7 @@ class ApexCapacitorPlugin : Plugin() {
 
     @PluginMethod
     fun getInstallReferrer(call: PluginCall) {
-        val data = JSObject().put("referrer", lastInstallReferrer ?: JSONull())
+        val data = JSObject().put("referrer", lastInstallReferrer ?: JSONObject.NULL)
         call.resolve(data)
     }
 
@@ -484,32 +485,103 @@ class ApexCapacitorPlugin : Plugin() {
         val commitSha = call.getString("commitSha")
 
         // Bitmap the activity's decor view on the main thread, JPEG-encode
-        // + base64, then POST off the main thread.
+        // + base64, then POST off the main thread. PixelCopy (API 26+) is
+        // the correct way to snapshot a hardware-accelerated window — it
+        // copies the actual rendered surface, so SurfaceView / video /
+        // GL content is captured rather than coming out black. Older API
+        // levels fall back to the software `view.draw(Canvas)` path.
         activity.runOnUiThread {
             try {
-                // TODO(native-unverified): decor-view bitmap capture cannot
-                // be compiled/verified in this environment.
                 val decor = activity.window.decorView
+                val width = decor.width.coerceAtLeast(1)
+                val height = decor.height.coerceAtLeast(1)
                 val bitmap = android.graphics.Bitmap.createBitmap(
-                    decor.width.coerceAtLeast(1),
-                    decor.height.coerceAtLeast(1),
+                    width,
+                    height,
                     android.graphics.Bitmap.Config.ARGB_8888,
                 )
-                val canvas = android.graphics.Canvas(bitmap)
-                decor.draw(canvas)
-                val stream = java.io.ByteArrayOutputStream()
-                bitmap.compress(android.graphics.Bitmap.CompressFormat.JPEG, 70, stream)
-                val imageBase64 = android.util.Base64.encodeToString(
-                    stream.toByteArray(),
-                    android.util.Base64.NO_WRAP,
-                )
-                uploadVariantScreenshot(call, experimentId, variantKey, imageBase64, label, commitSha)
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    val location = IntArray(2)
+                    decor.getLocationInWindow(location)
+                    val rect = android.graphics.Rect(
+                        location[0],
+                        location[1],
+                        location[0] + width,
+                        location[1] + height,
+                    )
+                    try {
+                        android.view.PixelCopy.request(
+                            activity.window,
+                            rect,
+                            bitmap,
+                            { copyResult ->
+                                if (copyResult == android.view.PixelCopy.SUCCESS) {
+                                    encodeAndUploadScreenshot(
+                                        call, experimentId, variantKey, bitmap, label, commitSha,
+                                    )
+                                } else {
+                                    // PixelCopy refused (e.g. window not
+                                    // backed by a surface yet) — fall back
+                                    // to the software draw path.
+                                    drawViewToBitmap(decor, bitmap)
+                                    encodeAndUploadScreenshot(
+                                        call, experimentId, variantKey, bitmap, label, commitSha,
+                                    )
+                                }
+                            },
+                            android.os.Handler(android.os.Looper.getMainLooper()),
+                        )
+                    } catch (e: IllegalArgumentException) {
+                        // PixelCopy throws if the source isn't ready — software fallback.
+                        drawViewToBitmap(decor, bitmap)
+                        encodeAndUploadScreenshot(
+                            call, experimentId, variantKey, bitmap, label, commitSha,
+                        )
+                    }
+                } else {
+                    drawViewToBitmap(decor, bitmap)
+                    encodeAndUploadScreenshot(
+                        call, experimentId, variantKey, bitmap, label, commitSha,
+                    )
+                }
             } catch (e: Exception) {
                 call.resolve(JSObject().put("captured", false).put("reason", "encode_failed"))
             }
         }
     }
 
+    /** Software-rasterize a view's current content into [bitmap]. */
+    private fun drawViewToBitmap(view: android.view.View, bitmap: android.graphics.Bitmap) {
+        val canvas = android.graphics.Canvas(bitmap)
+        view.draw(canvas)
+    }
+
+    /**
+     * JPEG-encode + base64 a captured bitmap and hand it off to the
+     * background uploader. Resolves `encode_failed` if compression throws.
+     */
+    private fun encodeAndUploadScreenshot(
+        call: PluginCall,
+        experimentId: String,
+        variantKey: String,
+        bitmap: android.graphics.Bitmap,
+        label: String?,
+        commitSha: String?,
+    ) {
+        try {
+            val stream = java.io.ByteArrayOutputStream()
+            bitmap.compress(android.graphics.Bitmap.CompressFormat.JPEG, 70, stream)
+            val imageBase64 = android.util.Base64.encodeToString(
+                stream.toByteArray(),
+                android.util.Base64.NO_WRAP,
+            )
+            uploadVariantScreenshot(call, experimentId, variantKey, imageBase64, label, commitSha)
+        } catch (e: Exception) {
+            call.resolve(JSObject().put("captured", false).put("reason", "encode_failed"))
+        }
+    }
+
     /**
      * POST a captured screenshot to `${apiBaseUrl}/api/experiments/:id/
      * assets` with `source: "device"`. Networking mirrors `identify()`.
@@ -590,7 +662,7 @@ class ApexCapacitorPlugin : Plugin() {
     @PluginMethod
     fun getInitialDeepLink(call: PluginCall) {
         val url = deepLinks.consumeInitialUrl()
-        val data = JSObject().put("url", url ?: JSONull())
+        val data = JSObject().put("url", url ?: JSONObject.NULL)
         call.resolve(data)
     }
 
@@ -639,11 +711,11 @@ class ApexCapacitorPlugin : Plugin() {
     fun getCurrentSession(call: PluginCall) {
         val current = sessionManager.getCurrent()
         val data = JSObject()
-            .put("sessionId", current?.sessionId ?: JSONull())
+            .put("sessionId", current?.sessionId ?: JSONObject.NULL)
             .put(
                 "startedAt",
                 current?.startedAtMs?.let { java.time.Instant.ofEpochMilli(it).toString() }
-                    ?: JSONull()
+                    ?: JSONObject.NULL
             )
         call.resolve(data)
     }
@@ -705,14 +777,14 @@ class ApexCapacitorPlugin : Plugin() {
     fun getQueueSize(call: PluginCall) {
         val queue = offlineQueue
         if (queue == null) {
-            call.resolve(JSObject().put("count", 0).put("oldestEventAt", JSONull()))
+            call.resolve(JSObject().put("count", 0).put("oldestEventAt", JSONObject.NULL))
             return
         }
         val oldest = queue.oldestEventAtMs()
             ?.let { java.time.Instant.ofEpochMilli(it).toString() }
         val data = JSObject()
             .put("count", queue.size())
-            .put("oldestEventAt", oldest ?: JSONull())
+            .put("oldestEventAt", oldest ?: JSONObject.NULL)
         call.resolve(data)
     }
 
@@ -839,8 +911,3 @@ private class FileQueueStorage(private val file: File) : QueueStorage {
         file.writeText(contents)
     }
 }
-
-/** Sentinel for passing JSON null to Capacitor's JSObject helpers. */
-private object JSONull {
-    override fun toString(): String = "null"
-}

package/ios/Sources/ApexCapacitorPluginBridge/ApexCapacitorPlugin.swift

@@ -686,9 +686,25 @@ public class ApexCapacitorPlugin: CAPPlugin, CAPBridgedPlugin, UNUserNotificatio
         // UIKit snapshot API.
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
-            // TODO(native-unverified): key-window discovery + renderer
-            // cannot be compiled/verified in this environment.
-            guard let window = UIApplication.shared.windows.first(where: { $0.isKeyWindow }) ?? UIApplication.shared.windows.first,
+            // Modern key-window discovery: walk the connected scenes for
+            // the foreground-active UIWindowScene, then take its key
+            // window. `UIApplication.shared.windows` /
+            // `UIApplication.shared.keyWindow` are deprecated as of iOS
+            // 15; scanning scene windows works on the iOS 13+ deployment
+            // target without tripping the deprecation.
+            let windowScene = UIApplication.shared.connectedScenes
+                .first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene
+                ?? UIApplication.shared.connectedScenes.first(where: { $0 is UIWindowScene }) as? UIWindowScene
+            let keyWindow: UIWindow?
+            if #available(iOS 15.0, *) {
+                keyWindow = windowScene?.keyWindow
+                    ?? windowScene?.windows.first(where: { $0.isKeyWindow })
+                    ?? windowScene?.windows.first
+            } else {
+                keyWindow = windowScene?.windows.first(where: { $0.isKeyWindow })
+                    ?? windowScene?.windows.first
+            }
+            guard let window = keyWindow,
                   let rootView = window.rootViewController?.view else {
                 call.resolve(["captured": false, "reason": "no_window"])
                 return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apex-inc/capacitor-plugin",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "Apex Capacitor plugin — iOS/Android attribution, events, deep linking, SKAN, and offline-tolerant tracking for Capacitor apps.",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",