Skip creating navigator in case isFinishing in onCreate, handle missi…

…ng navigator in onDestroy (#6292) closes #6281
wix · Jun 10, 2020 · 5c6ccd1 · 5c6ccd1
1 parent bf6a99d
commit 5c6ccd1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java b/lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java
@@ -33,6 +33,9 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (isFinishing()) {
+            return;
+        }
         addDefaultSplashLayout();
         navigator = new Navigator(this,
                 new ChildControllersRegistry(),
@@ -72,7 +75,9 @@ protected void onPause() {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        navigator.destroy();
+        if (navigator != null) {
+            navigator.destroy();
+        }
         getReactGateway().onActivityDestroyed(this);
     }