react and activity lifecycle race conditions fix

android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -50,7 +50,7 @@ public abstract class NavigationApplication extends Application {
     public void onReactInitialized(ReactContext reactContext) {
         // nothing
     }
-    
+
     public String getJsEntryFileName() {
         return "index.android";
     }
@@ -61,7 +61,6 @@ public abstract class NavigationApplication extends Application {
 
     public abstract boolean isDebug();
 
-
     @Nullable
     public abstract List<ReactPackage> createAdditionalReactPackages();
 

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

@@ -17,6 +17,7 @@ import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.ReactGateway;
 import com.reactnativenavigation.react.RedboxPermission;
+import com.reactnativenavigation.utils.IntentUtils;
 
 import java.util.List;
 
@@ -35,14 +36,16 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     private ActivityParams activityParams;
     private ModalController modalController;
     private Layout layout;
+    private boolean waitingForNewJsContext = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         if (!NavigationApplication.instance.isReactContextInitialized()) {
-            NavigationApplication.instance.startReactContext();
+            waitingForNewJsContext = true;
             finish();
+            startActivity(IntentUtils.getLauncherIntent());
             return;
         }
 
@@ -71,30 +74,36 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         }
 
         currentActivity = this;
-        NavigationApplication.instance.getReactGateway().onResume(this, this, this);
+        NavigationApplication.instance.getReactGateway().onResumeActivity(this, this, this);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
         currentActivity = null;
-        NavigationApplication.instance.getReactGateway().onPause();
+        NavigationApplication.instance.getReactGateway().onPauseActivity();
     }
 
     @Override
     protected void onDestroy() {
+        destroyLayouts();
+        destroyJsIfNeeded();
+        super.onDestroy();
+    }
+
+    private void destroyLayouts() {
         if (modalController != null) {
             modalController.destroy();
         }
         if (layout != null) {
             layout.destroy();
         }
-        if (currentActivity == null || currentActivity.isFinishing()) {
-            if (NavigationApplication.instance.isReactContextInitialized()) {
-                NavigationApplication.instance.getReactGateway().onDestroyApp();
-            }
+    }
+
+    private void destroyJsIfNeeded() {
+        if (!waitingForNewJsContext && (currentActivity == null || currentActivity.isFinishing())) {
+            NavigationApplication.instance.getReactGateway().onDestroyApp();
         }
-        super.onDestroy();
     }
 
     @Override

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

@@ -18,6 +18,12 @@ public abstract class SplashActivity extends AppCompatActivity {
         NavigationApplication.instance.startReactContext();
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        finish();
+    }
+
     private void setSplashLayout() {
         final int splashLayout = getSplashLayout();
         if (splashLayout > 0) {

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

@@ -64,12 +64,12 @@ public class NavigationReactGateway implements ReactGateway, ReactInstanceManage
         reactInstanceManager = null;
     }
 
-    public void onPause() {
+    public void onPauseActivity() {
         reactInstanceManager.onHostPause();
         onJsDevReloadListener = null;
     }
 
-    public void onResume(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler, OnJsDevReloadListener onJsDevReloadListener) {
+    public void onResumeActivity(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler, OnJsDevReloadListener onJsDevReloadListener) {
         this.onJsDevReloadListener = onJsDevReloadListener;
         reactInstanceManager.onHostResume(activity, defaultHardwareBackBtnHandler);
     }

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

@@ -24,9 +24,9 @@ public interface ReactGateway {
 
     ReactInstanceManager getReactInstanceManager();
 
-    void onResume(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler, OnJsDevReloadListener onJsDevReloadListener);
+    void onResumeActivity(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler, OnJsDevReloadListener onJsDevReloadListener);
 
-    void onPause();
+    void onPauseActivity();
 
     void onDestroyApp();
 

android/app/src/main/java/com/reactnativenavigation/utils/IntentUtils.java

@@ -0,0 +1,19 @@
+package com.reactnativenavigation.utils;
+
+import android.content.Intent;
+
+import com.reactnativenavigation.NavigationApplication;
+
+public class IntentUtils {
+    public static Intent getLauncherIntent() {
+        Intent intent = NavigationApplication.instance.getPackageManager().getLaunchIntentForPackage(NavigationApplication.instance.getPackageName());
+        if (intent == null)
+            intent = new Intent();
+        intent.setPackage(null);
+        intent.setFlags(0);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setAction(Intent.ACTION_MAIN);
+        intent.addCategory(Intent.CATEGORY_LAUNCHER);
+        return intent;
+    }
+}

example-redux/android/app/src/main/java/com/exampleredux/MainActivity.java

@@ -1,7 +1,16 @@
 package com.exampleredux;
 
+import android.graphics.Color;
+import android.view.View;
+
 import com.reactnativenavigation.controllers.SplashActivity;
 
 public class MainActivity extends SplashActivity {
-    
+
+    @Override
+    public View createSplashLayout() {
+        View view = new View(this);
+        view.setBackgroundColor(Color.BLUE);
+        return view;
+    }
 }

example-redux/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

example-redux/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jun 30 11:51:04 IDT 2016
+#Tue Aug 16 15:10:42 IDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip