Add null and thread safety

Author: zoontek

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.kt

@@ -29,14 +29,14 @@ import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
 import com.facebook.react.views.view.setStatusBarStyle
 import com.facebook.react.views.view.setStatusBarTranslucency
 import com.facebook.react.views.view.setStatusBarVisibility
+import java.util.Collections
+import java.util.WeakHashMap
 
 /** [NativeModule] that allows changing the appearance of the status bar. */
 @ReactModule(name = NativeStatusBarManagerAndroidSpec.NAME)
 internal class StatusBarModule(reactContext: ReactApplicationContext?) :
     NativeStatusBarManagerAndroidSpec(reactContext), ExtraWindowEventListener {
 
-  private val extraWindows = mutableSetOf<Window>()
-
   init {
     reactApplicationContext.addExtraWindowEventListener(this)
   }
@@ -47,9 +47,9 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onExtraWindowCreate(window: Window) {
-    extraWindows.add(window)
-
     UiThreadUtil.runOnUiThread {
+      extraWindows.add(window)
+
       reactApplicationContext.currentActivity?.window?.let {
         val controller = WindowCompat.getInsetsController(it, it.decorView)
         val insets = ViewCompat.getRootWindowInsets(it.decorView)
@@ -63,7 +63,7 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onExtraWindowDestroy(window: Window) {
-    extraWindows.remove(window)
+    UiThreadUtil.runOnUiThread { extraWindows.remove(window) }
   }
 
   @Suppress("DEPRECATION")
@@ -177,5 +177,6 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
     private const val HEIGHT_KEY = "HEIGHT"
     private const val DEFAULT_BACKGROUND_COLOR_KEY = "DEFAULT_BACKGROUND_COLOR"
     const val NAME: String = NativeStatusBarManagerAndroidSpec.NAME
+    private val extraWindows = Collections.newSetFromMap<Window>(WeakHashMap())
   }
 }