Fix NPE when showing Overlay (#5909)

Co-authored-by: Yogev Ben David <yogevbd@wix.com>

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OverlayManager.java

@@ -10,18 +10,16 @@ import com.reactnativenavigation.views.BehaviourDelegate;
 
 import java.util.HashMap;
 
+import androidx.annotation.Nullable;
+
 import static com.reactnativenavigation.utils.CollectionUtils.*;
 import static com.reactnativenavigation.utils.CoordinatorLayoutUtils.matchParentWithBehaviour;
 
 public class OverlayManager {
     private final HashMap<String, ViewController> overlayRegistry = new HashMap<>();
-    private ViewGroup contentLayout;
-
-    public void setContentLayout(ViewGroup contentLayout) {
-        this.contentLayout = contentLayout;
-    }
 
-    public void show(ViewGroup overlaysContainer, ViewController overlay, CommandListener listener) {
+    public void show(@Nullable ViewGroup contentLayout, ViewGroup overlaysContainer, ViewController overlay, CommandListener listener) {
+        if (contentLayout == null) return;
         if (overlaysContainer.getParent() == null) contentLayout.addView(overlaysContainer);
         overlayRegistry.put(overlay.getId(), overlay);
         overlay.addOnAppearedListener(() -> listener.onSuccess(overlay.getId()));
@@ -40,7 +38,6 @@ public class OverlayManager {
 
     public void destroy() {
         forEach(overlayRegistry.values(), this::destroyOverlay);
-        contentLayout = null;
     }
 
     public int size() {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/Navigator.java

@@ -64,7 +64,6 @@ public class Navigator extends ParentController {
 
     public void setContentLayout(ViewGroup contentLayout) {
         this.contentLayout = contentLayout;
-        overlayManager.setContentLayout(contentLayout);
         contentLayout.addView(rootLayout);
         contentLayout.addView(modalsLayout);
     }
@@ -201,7 +200,7 @@ public class Navigator extends ParentController {
     }
 
     public void showOverlay(ViewController overlay, CommandListener listener) {
-        overlayManager.show(overlaysLayout, overlay, listener);
+        overlayManager.show(contentLayout, overlaysLayout, overlay, listener);
     }
 
     public void dismissOverlay(final String componentId, CommandListener listener) {

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java

@@ -123,8 +123,6 @@ public class NavigatorTest extends BaseTest {
     public void setContentLayout() {
         ViewGroup contentLayout = Mockito.mock(ViewGroup.class);
         uut.setContentLayout(contentLayout);
-
-        verify(overlayManager).setContentLayout(contentLayout);
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/overlay/OverlayManagerTest.java

@@ -41,20 +41,19 @@ public class OverlayManagerTest extends BaseTest {
         overlay1 = spy(new SimpleViewController(activity, childRegistry, OVERLAY_ID_1, new Options()));
         overlay2 = spy(new SimpleViewController(activity, childRegistry, OVERLAY_ID_2, new Options()));
         uut = new OverlayManager();
-        uut.setContentLayout(contentLayout);
     }
 
     @Test
     public void show_attachesOverlayContainerToContentLayout() {
-        uut.show(overlayContainer, overlay1, new CommandListenerAdapter());
+        uut.show(contentLayout, overlayContainer, overlay1, new CommandListenerAdapter());
         assertThat(overlayContainer.getParent()).isEqualTo(contentLayout);
-        uut.show(overlayContainer, overlay2, new CommandListenerAdapter());
+        uut.show(contentLayout, overlayContainer, overlay2, new CommandListenerAdapter());
     }
 
     @Test
     public void show() {
         CommandListenerAdapter listener = spy(new CommandListenerAdapter());
-        uut.show(overlayContainer, overlay1, listener);
+        uut.show(contentLayout, overlayContainer, overlay1, listener);
         verify(listener, times(1)).onSuccess(OVERLAY_ID_1);
         assertThat(overlay1.getView().getParent()).isEqualTo(overlayContainer);
         assertMatchParent(overlay1.getView());
@@ -62,7 +61,7 @@ public class OverlayManagerTest extends BaseTest {
 
     @Test
     public void dismiss() {
-        uut.show(overlayContainer, overlay1, new CommandListenerAdapter());
+        uut.show(contentLayout, overlayContainer, overlay1, new CommandListenerAdapter());
         assertThat(uut.size()).isOne();
         CommandListener listener = spy(new CommandListenerAdapter());
         uut.dismiss(overlay1.getId(), listener);
@@ -80,8 +79,8 @@ public class OverlayManagerTest extends BaseTest {
 
     @Test
     public void dismiss_onViewReturnedToFront() {
-        uut.show(overlayContainer, overlay1, new CommandListenerAdapter());
-        uut.show(overlayContainer, overlay2, new CommandListenerAdapter());
+        uut.show(contentLayout, overlayContainer, overlay1, new CommandListenerAdapter());
+        uut.show(contentLayout, overlayContainer, overlay2, new CommandListenerAdapter());
         verify(overlay1, times(0)).onViewBroughtToFront();
 
         uut.dismiss(OVERLAY_ID_2, new CommandListenerAdapter());
@@ -90,8 +89,8 @@ public class OverlayManagerTest extends BaseTest {
 
     @Test
     public void dismiss_overlayContainerIsRemovedIfAllOverlaysAreDismissed() {
-        uut.show(overlayContainer, overlay1, new CommandListenerAdapter());
-        uut.show(overlayContainer, overlay2, new CommandListenerAdapter());
+        uut.show(contentLayout, overlayContainer, overlay1, new CommandListenerAdapter());
+        uut.show(contentLayout, overlayContainer, overlay2, new CommandListenerAdapter());
 
         uut.dismiss(OVERLAY_ID_2, new CommandListenerAdapter());
         assertThat(overlayContainer.getParent()).isEqualTo(contentLayout);