From ab913eb291d1295ad6d0a0b84c627aa24ee08ebd Mon Sep 17 00:00:00 2001
From: Tomas Psota <to.psota@gmail.com>
Date: Mon, 23 Feb 2026 11:12:26 +0100
Subject: [PATCH] feat: resolve potential exception on all checks finished

---
 CHANGELOG.md                                          | 11 +++++++++++
 .../java/com/aheaditec/freerasp/FreeraspPlugin.kt     | 11 +++++++++++
 package.json                                          |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2685bf2..ac71a5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.1] - 2026-02-13
+
+- Android SDK version: 18.0.2
+- iOS SDK version: 6.13.0
+
+### Capacitor
+
+#### Fixed
+
+- Resolved potential NullPointerException when execution state events are being sent 
+
 ## [2.4.0] - 2026-02-13
 
 - Android SDK version: 18.0.2
diff --git a/android/src/main/java/com/aheaditec/freerasp/FreeraspPlugin.kt b/android/src/main/java/com/aheaditec/freerasp/FreeraspPlugin.kt
index cceaed8..2424632 100644
--- a/android/src/main/java/com/aheaditec/freerasp/FreeraspPlugin.kt
+++ b/android/src/main/java/com/aheaditec/freerasp/FreeraspPlugin.kt
@@ -31,6 +31,11 @@ class FreeraspPlugin : Plugin() {
 
     private var registered = true
 
+    override fun load() {
+        initializeEventKeys()
+        super.load()
+    }
+
     @PluginMethod
     fun talsecStart(call: PluginCall) {
         val config = call.getObject("config")
@@ -107,6 +112,12 @@ class FreeraspPlugin : Plugin() {
         backgroundHandlerThread.quitSafely()
     }
 
+    // Trigger lazy initialization of the freeRASP events
+    private fun initializeEventKeys() {
+        ThreatEvent.ALL_EVENTS
+        RaspExecutionStateEvent.ALL_EVENTS
+    }
+
     /**
      * Method to get the random identifiers of callbacks
      */
diff --git a/package.json b/package.json
index 72b1af1..f7d40d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-freerasp",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Capacitor plugin for improving app security and threat monitoring on Android and iOS mobile devices",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",