From e653ecef5d05ffcc9069408bd60c04fda4786475 Mon Sep 17 00:00:00 2001
From: Oskar Eichler <oskar@songstats.com>
Date: Mon, 31 Aug 2026 13:00:12 +0300
Subject: [PATCH] fix(Android): always release modal lifecycle listener

---
 .../react/modal/ModalViewManager.kt           |  5 +++--
 .../react/modal/ModalViewManagerTest.kt       | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 android/src/test/java/com/reactnativenavigation/react/modal/ModalViewManagerTest.kt

diff --git a/android/src/main/java/com/reactnativenavigation/react/modal/ModalViewManager.kt b/android/src/main/java/com/reactnativenavigation/react/modal/ModalViewManager.kt
index 2ab4afcd71e..8008ce2b373 100644
--- a/android/src/main/java/com/reactnativenavigation/react/modal/ModalViewManager.kt
+++ b/android/src/main/java/com/reactnativenavigation/react/modal/ModalViewManager.kt
@@ -55,8 +55,9 @@ class ModalViewManager(val reactContext: ReactContext) : ViewGroupManager<ModalH
 
     override fun onDropViewInstance(modal: ModalHostLayout) {
         super.onDropViewInstance(modal)
-        navigator?.let {
-            it.dismissModal(modal.viewController.id, CommandListenerAdapter())
+        try {
+            navigator?.dismissModal(modal.viewController.id, CommandListenerAdapter())
+        } finally {
             modal.onDropInstance()
         }
     }
diff --git a/android/src/test/java/com/reactnativenavigation/react/modal/ModalViewManagerTest.kt b/android/src/test/java/com/reactnativenavigation/react/modal/ModalViewManagerTest.kt
new file mode 100644
index 00000000000..45c35775854
--- /dev/null
+++ b/android/src/test/java/com/reactnativenavigation/react/modal/ModalViewManagerTest.kt
@@ -0,0 +1,21 @@
+package com.reactnativenavigation.react.modal
+
+import com.facebook.react.bridge.ReactContext
+import com.reactnativenavigation.BaseTest
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+
+class ModalViewManagerTest : BaseTest() {
+    @Test
+    fun dropRemovesLifecycleListenerWithoutActiveNavigator() {
+        val reactContext = mock<ReactContext>()
+        whenever(reactContext.currentActivity).thenReturn(null)
+        val modal = mock<ModalHostLayout>()
+
+        ModalViewManager(reactContext).onDropViewInstance(modal)
+
+        verify(modal).onDropInstance()
+    }
+}