From 97ba001657714577847a69380fea853ce510f088 Mon Sep 17 00:00:00 2001 From: Varun Gupta Date: Sun, 18 Feb 2018 17:01:18 +0530 Subject: [PATCH] Fix EmptyStackException --- .../views/SnackbarAndFabContainer.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/reactnativenavigation/views/SnackbarAndFabContainer.java b/android/app/src/main/java/com/reactnativenavigation/views/SnackbarAndFabContainer.java index 767bb5e954a..1c2dc645d30 100644 --- a/android/app/src/main/java/com/reactnativenavigation/views/SnackbarAndFabContainer.java +++ b/android/app/src/main/java/com/reactnativenavigation/views/SnackbarAndFabContainer.java @@ -11,6 +11,9 @@ import com.reactnativenavigation.layouts.Layout; import com.reactnativenavigation.params.FabParams; import com.reactnativenavigation.params.SnackbarParams; +import com.reactnativenavigation.screens.Screen; + +import java.util.EmptyStackException; public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakbar.OnDismissListener, Subscriber{ private Snakbar snakbar; @@ -67,7 +70,13 @@ private void updateFab(final FabParams fabParams) { @Override public void run() { if (fabParams != null) { - if (layout.getCurrentScreen().getScreenInstanceId().equals(fabParams.screenInstanceId)) { + Screen currentScreen = null; + try { + currentScreen = layout.getCurrentScreen(); + } catch(EmptyStackException exception) { + currentScreen = null; + } + if (currentScreen != null && currentScreen.getScreenInstanceId().equals(fabParams.screenInstanceId)) { fabCoordinator.add(fabParams); } }