From 32ff4843686f470e9b1447b02f34b747a75bb0a4 Mon Sep 17 00:00:00 2001
From: kentwilliams-stripe <kentwilliams@stripe.com>
Date: Wed, 15 Jan 2025 11:43:42 -0800
Subject: [PATCH 1/2] Null check

---
 .../stripe/identity/StripeIdentity.kt         | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/packages/identity/android/src/main/java/com/getcapacitor/community/stripe/identity/StripeIdentity.kt b/packages/identity/android/src/main/java/com/getcapacitor/community/stripe/identity/StripeIdentity.kt
index 888058bd..f7cefba1 100644
--- a/packages/identity/android/src/main/java/com/getcapacitor/community/stripe/identity/StripeIdentity.kt
+++ b/packages/identity/android/src/main/java/com/getcapacitor/community/stripe/identity/StripeIdentity.kt
@@ -71,33 +71,48 @@ class StripeIdentity(
     fun onVerificationCompleted(bridge: Bridge, callbackId: String?) {
         val call = bridge.getSavedCall(callbackId)
         notifyListeners(IdentityVerificationSheetEvent.Completed.webEventName, emptyObject)
-        call.resolve(
-            JSObject().put(
-                "identityVerificationResult",
-                IdentityVerificationSheetEvent.Completed.webEventName
+
+        if (call) {
+            call.resolve(
+                JSObject().put(
+                    "identityVerificationResult",
+                    IdentityVerificationSheetEvent.Completed.webEventName
+                )
             )
-        )
+        } else {
+            Logger.error("onVerificationCompleted: No callbackId found")
+        }
     }
 
     fun onVerificationCancelled(bridge: Bridge, callbackId: String?) {
         val call = bridge.getSavedCall(callbackId)
         notifyListeners(IdentityVerificationSheetEvent.Canceled.webEventName, emptyObject)
-        call.resolve(
-            JSObject().put(
-                "identityVerificationResult",
-                IdentityVerificationSheetEvent.Canceled.webEventName
+
+        if (call) {
+            call.resolve(
+                JSObject().put(
+                    "identityVerificationResult",
+                    IdentityVerificationSheetEvent.Canceled.webEventName
+                )
             )
-        )
+        } else {
+            Logger.error("onVerificationCancelled: No callbackId found")
+        }
     }
 
     fun onVerificationFailed(bridge: Bridge, callbackId: String?) {
         val call = bridge.getSavedCall(callbackId)
         notifyListeners(IdentityVerificationSheetEvent.Failed.webEventName, emptyObject)
-        call.resolve(
-            JSObject().put(
-                "identityVerificationResult",
-                IdentityVerificationSheetEvent.Failed.webEventName
+
+        if (call) {
+            call.resolve(
+                JSObject().put(
+                    "identityVerificationResult",
+                    IdentityVerificationSheetEvent.Failed.webEventName
+                )
             )
-        )
+        } else {
+            Logger.error("onVerificationFailed: No callbackId found")
+        }
     }
 }

From 475d31de75d9d1d907c25e482b68322d57f1df6b Mon Sep 17 00:00:00 2001
From: kentwilliams-stripe <kentwilliams@stripe.com>
Date: Wed, 15 Jan 2025 14:39:02 -0800
Subject: [PATCH 2/2] Update StripeIdentity.kt

---
 .../community/stripe/identity/StripeIdentity.kt             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/identity/android/src/main/java/com/getcapacitor/community/stripe/identity/StripeIdentity.kt b/packages/identity/android/src/main/java/com/getcapacitor/community/stripe/identity/StripeIdentity.kt
index f7cefba1..392ec010 100644
--- a/packages/identity/android/src/main/java/com/getcapacitor/community/stripe/identity/StripeIdentity.kt
+++ b/packages/identity/android/src/main/java/com/getcapacitor/community/stripe/identity/StripeIdentity.kt
@@ -72,7 +72,7 @@ class StripeIdentity(
         val call = bridge.getSavedCall(callbackId)
         notifyListeners(IdentityVerificationSheetEvent.Completed.webEventName, emptyObject)
 
-        if (call) {
+        if (call != null) {
             call.resolve(
                 JSObject().put(
                     "identityVerificationResult",
@@ -88,7 +88,7 @@ class StripeIdentity(
         val call = bridge.getSavedCall(callbackId)
         notifyListeners(IdentityVerificationSheetEvent.Canceled.webEventName, emptyObject)
 
-        if (call) {
+        if (call != null) {
             call.resolve(
                 JSObject().put(
                     "identityVerificationResult",
@@ -104,7 +104,7 @@ class StripeIdentity(
         val call = bridge.getSavedCall(callbackId)
         notifyListeners(IdentityVerificationSheetEvent.Failed.webEventName, emptyObject)
 
-        if (call) {
+        if (call != null) {
             call.resolve(
                 JSObject().put(
                     "identityVerificationResult",