Start launcher activity if NavigationActivity is recreated after saved instance state

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -62,9 +62,9 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (!NavigationApplication.instance.isReactContextInitialized()) {
-            NavigationApplication.instance.startReactContextOnceInBackgroundAndExecuteJS();
-            return;
+        if (!NavigationApplication.instance.getReactGateway().hasStartedCreatingContext()) {
+            SplashActivity.start(this);
+            finish();
         }
 
         activityParams = NavigationCommandsHandler.parseActivityParams(getIntent());

android/app/src/main/java/com/reactnativenavigation/controllers/SplashActivity.java

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.controllers;
 
+import android.app.Activity;
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.LayoutRes;
@@ -13,6 +15,17 @@ import com.reactnativenavigation.react.ReactDevPermission;
 public abstract class SplashActivity extends AppCompatActivity {
     public static boolean isResumed = false;
 
+    public static void start(Activity activity) {
+        Intent intent = activity.getPackageManager().getLaunchIntentForPackage(activity.getPackageName());
+        if (intent == null) return;
+        intent.setAction(Intent.ACTION_MAIN);
+        intent.addCategory(Intent.CATEGORY_LAUNCHER);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        activity.startActivity(intent);
+    }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java

@@ -66,7 +66,7 @@ public class NavigationReactGateway implements ReactGateway {
 	public void onDestroyApp(Activity activity) {
         if (NavigationApplication.instance.clearHostOnActivityDestroy()) {
             getReactInstanceManager().onHostDestroy();
-        } else if (hasStartedCreatingContext()) {
+        } else if (hasStartedCreatingContext() && isInitialized()) {
             getReactInstanceManager().onHostDestroy(activity);
         }
         if (NavigationApplication.instance.clearHostOnActivityDestroy()) {
@@ -77,7 +77,7 @@ public class NavigationReactGateway implements ReactGateway {
 	public void onPauseActivity(Activity activity) {
         if (NavigationApplication.instance.clearHostOnActivityDestroy()) {
             getReactInstanceManager().onHostPause();
-        } else if (hasStartedCreatingContext()) {
+        } else if (hasStartedCreatingContext() && isInitialized()) {
 		    getReactInstanceManager().onHostPause(activity);
         }
 		jsDevReloadHandler.onPauseActivity();