android: resume activity fix

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ApplicationLifecycleTest.java

@@ -5,6 +5,7 @@ import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.BySelector;
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiObjectNotFoundException;
 import android.support.test.uiautomator.UiScrollable;
 import android.support.test.uiautomator.UiSelector;
 import android.support.test.uiautomator.Until;
@@ -48,18 +49,21 @@ public class ApplicationLifecycleTest {
     public void _2_relaunchFromBackground() throws Exception {
         launchTheApp();
         assertMainShown();
+        push();
+        assertPushedScreenShown();
 
         uiDevice().pressHome();
         uiDevice().pressRecentApps();
         elementByText("Playground").click();
 
-        assertMainShown();
+        assertPushedScreenShown();
     }
 
     @Test
     public void _3_relaunchAfterClose() throws Exception {
         launchTheApp();
-        assertMainShown();
+        push();
+        assertPushedScreenShown();
 
         uiDevice().pressBack();
 
@@ -70,20 +74,20 @@ public class ApplicationLifecycleTest {
     @Test
     public void _4_deviceOrientationDoesNotDestroyActivity() throws Exception {
         launchTheApp();
-        assertMainShown();
-        elementByText("PUSH").click();
-        assertExists(By.text("Pushed screen"));
+        push();
+        assertPushedScreenShown();
 
         uiDevice().setOrientationLeft();
         Thread.sleep(100);
 
-        assertExists(By.text("Pushed screen"));
+        assertPushedScreenShown();
     }
 
     @Test
     public void _5_relaunchAfterActivityKilledBySystem() throws Exception {
         launchTheApp();
-        assertMainShown();
+        push();
+        assertPushedScreenShown();
 
         uiDevice().pressHome();
         uiDevice().executeShellCommand("am kill " + PACKAGE_NAME);
@@ -93,10 +97,20 @@ public class ApplicationLifecycleTest {
         assertMainShown();
     }
 
+    private void push() throws UiObjectNotFoundException {
+        elementByText("PUSH").click();
+    }
+
     private void assertMainShown() {
         assertExists(By.text("React Native Navigation!"));
     }
 
+    private void launchTheApp() throws Exception {
+        uiDevice().executeShellCommand("am start -n " + PACKAGE_NAME + "/.MainActivity");
+        uiDevice().waitForIdle();
+        acceptOverlayPermissionIfNeeded();
+    }
+
     private void acceptOverlayPermissionIfNeeded() throws Exception {
         if (elementByText("Draw over other apps").exists()) {
             if (!elementByText("Playground").exists()) {
@@ -109,12 +123,6 @@ public class ApplicationLifecycleTest {
         }
     }
 
-    private void launchTheApp() throws Exception {
-        uiDevice().executeShellCommand("am start -n " + PACKAGE_NAME + "/.MainActivity");
-        uiDevice().waitForIdle();
-        acceptOverlayPermissionIfNeeded();
-    }
-
     private UiDevice uiDevice() {
         return UiDevice.getInstance(getInstrumentation());
     }
@@ -130,4 +138,8 @@ public class ApplicationLifecycleTest {
     private void assertExists(BySelector selector) {
         assertThat(uiDevice().wait(Until.hasObject(selector), TIMEOUT)).isTrue();
     }
+
+    private void assertPushedScreenShown() {
+        assertExists(By.text("Pushed screen"));
+    }
 }

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

@@ -45,8 +45,8 @@ public abstract class NavigationApplication extends Application implements React
         };
 
         registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
-            private AtomicBoolean creating = new AtomicBoolean(true);
-            private AtomicLong startTime = new AtomicLong();
+            private AtomicBoolean creating = new AtomicBoolean(false);
+            private AtomicLong startTime = new AtomicLong(0);
 
             @Override
             public void onActivityCreated(final Activity activity, Bundle bundle) {
@@ -68,6 +68,7 @@ public abstract class NavigationApplication extends Application implements React
                 }
 
                 if (!host.getReactInstanceManager().hasStartedCreatingInitialContext()) {
+                    creating.set(false);
                     startTime.set(System.currentTimeMillis());
                     host.getReactInstanceManager().addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
                         @Override
@@ -80,6 +81,7 @@ public abstract class NavigationApplication extends Application implements React
                             UiThread.postDelayed(new Runnable() {
                                 @Override
                                 public void run() {
+                                    android.util.Log.d("DebuggingIsHell", "NavigationApplication:run() " + 1);
                                     new NavigationEventEmitter(context).emitAppLaunched();
                                 }
                             }, diff);
@@ -96,6 +98,7 @@ public abstract class NavigationApplication extends Application implements React
                     UiThread.postDelayed(new Runnable() {
                         @Override
                         public void run() {
+                            android.util.Log.d("DebuggingIsHell", "NavigationApplication:run() " + 2);
                             new NavigationEventEmitter(host.getReactInstanceManager().getCurrentReactContext()).emitAppLaunched();
                         }
                     }, 1000);