Fix crash when dismissAllModals is called before root is set

wix · Mar 26, 2020 · 52bcd5b · 52bcd5b
1 parent d2f7f6d
commit 52bcd5b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/...android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java b/...android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java
@@ -14,11 +14,12 @@
 import java.util.EmptyStackException;
 import java.util.List;
 
-import javax.annotation.Nullable;
-
+import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
+import static com.reactnativenavigation.utils.ObjectUtils.perform;
+
 public class ModalStack {
     private List<ViewController> modals = new ArrayList<>();
     private final ModalPresenter presenter;
@@ -82,9 +83,9 @@ public void onSuccess(String childId) {
         }
     }
 
-    public void dismissAllModals(ViewController root, Options mergeOptions, CommandListener listener) {
+    public void dismissAllModals(@Nullable ViewController root, Options mergeOptions, CommandListener listener) {
         if (modals.isEmpty()) {
-            listener.onSuccess(root.getId());
+            listener.onSuccess(perform(root, "", ViewController::getId));
             return;
         }
         String topModalId = peek().getId();

diff --git a/...oid/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java b/...oid/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java
@@ -173,6 +173,13 @@ public void onSuccess(String childId) {
         verifyZeroInteractions(listener);
     }
 
+    @Test
+    public void dismissAllModal_resolvesPromiseSuccessfullyWhenCalledBeforeRootIsSet() {
+        CommandListenerAdapter spy = new CommandListenerAdapter();
+        uut.dismissAllModals(null, Options.EMPTY, spy);
+        verify(spy).onSuccess("");
+    }
+
     @Test
     public void dismissAllModals_resolveSuccessfullyIfEmpty() {
         CommandListener spy = spy(new CommandListenerAdapter());