From 15ff82f811287f9a686d993af9ee80f891a7774f Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@meta.com>
Date: Mon, 8 Apr 2024 08:14:39 -0700
Subject: [PATCH] Fix ClassCastException in `ReactModalHostView` (#43966)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/43966

The `context` field was confusing. I've renamed it to `currentActivityContext` +
I've made sure the `onKey` method is using the right context with a this@ accessor.

Changelog:
[Android] [Fixed] - Fix ClassCastException in `ReactModalHostView`

Reviewed By: GijsWeterings

Differential Revision: D55870250

fbshipit-source-id: a25a31452fb0d21cf8e2807eca62cf09fe4fd74b
---
 .../react/views/modal/ReactModalHostView.kt   | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt
index 05ea08a5f22..1c447282868 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt
@@ -26,7 +26,6 @@ import android.view.WindowManager
 import android.view.accessibility.AccessibilityEvent
 import android.widget.FrameLayout
 import androidx.annotation.UiThread
-import com.facebook.common.logging.FLog
 import com.facebook.react.R
 import com.facebook.react.bridge.GuardedRunnable
 import com.facebook.react.bridge.LifecycleEventListener
@@ -211,18 +210,11 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
     // If the existing Dialog is currently up, we may need to redraw it or we may be able to update
     // the property without having to recreate the dialog
-    dialog?.let { nonNullDialog ->
-      val dialogContext: Context? =
-          ContextUtils.findContextOfType(nonNullDialog.context, Activity::class.java)
-      // TODO(T85755791): remove after investigation
-      FLog.e(TAG, "Updating existing dialog with context: $dialogContext")
-
-      if (propertyRequiresNewDialog) {
-        dismiss()
-      } else {
-        updateProperties()
-        return
-      }
+    if (propertyRequiresNewDialog) {
+      dismiss()
+    } else {
+      updateProperties()
+      return
     }
 
     // Reset the flag since we are going to create a new dialog
@@ -235,17 +227,13 @@ public class ReactModalHostView(context: ThemedReactContext) :
         }
 
     val currentActivity = getCurrentActivity()
-    val context = currentActivity ?: context
-    val newDialog = Dialog(context, theme)
+    val newDialog = Dialog(currentActivity ?: context, theme)
     dialog = newDialog
     Objects.requireNonNull<Window>(newDialog.window)
         .setFlags(
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
 
-    // TODO(T85755791): remove after investigation
-    FLog.e(TAG, "Creating new dialog from context: " + context + "@" + context.hashCode())
-
     newDialog.setContentView(contentView)
     updateProperties()
 
@@ -269,7 +257,8 @@ public class ReactModalHostView(context: ThemedReactContext) :
                 // We redirect the rest of the key events to the current activity, since the
                 // activity expects to receive those events and react to them, ie. in the case of
                 // the dev menu
-                val innerCurrentActivity = (context as ReactContext).currentActivity
+                val innerCurrentActivity =
+                    (this@ReactModalHostView.context as ReactContext).currentActivity
                 if (innerCurrentActivity != null) {
                   return innerCurrentActivity.onKeyUp(keyCode, event)
                 }