react lifecycle events fixed on android

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

@@ -4,7 +4,9 @@ import android.content.Intent;
 import android.net.Uri;
 import android.provider.Settings;
 import android.support.test.uiautomator.By;
+import android.view.KeyEvent;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static android.support.test.InstrumentationRegistry.getInstrumentation;
@@ -57,6 +59,40 @@ public class ApplicationLifecycleTest extends BaseTest {
 		assertMainShown();
 	}
 
+	@Test
+	public void pressingMenuOpensDevMenu() throws Exception {
+		device().pressKeyCode(KeyEvent.KEYCODE_MENU);
+		assertExists(By.text("Debug JS Remotely"));
+	}
+
+	@Test
+	public void pressingRTwiceInSuccessionReloadsReactNative() throws Exception {
+		elementByText("PUSH").click();
+		assertExists(By.text("Pushed Screen"));
+
+		device().pressKeyCode(KeyEvent.KEYCODE_R);
+		device().pressKeyCode(KeyEvent.KEYCODE_R);
+		device().waitForIdle();
+		assertMainShown();
+	}
+
+	@Test
+	public void pressingRTwiceWithDelayDoesNothing() throws Exception {
+		elementByText("PUSH").click();
+		assertExists(By.text("Pushed Screen"));
+
+		device().pressKeyCode(KeyEvent.KEYCODE_R);
+		Thread.sleep(1500);
+		device().pressKeyCode(KeyEvent.KEYCODE_R);
+		assertExists(By.text("Pushed Screen"));
+	}
+
+	@Test
+	@Ignore
+	public void reloadReactNativeDoesNotCausesLeaks() throws Exception {
+		// TODO
+	}
+
 	private void killAppSaveInstanceState_ByTogglingPermissions() throws Exception {
 		device().pressHome();
 

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

@@ -1,37 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.support.test.uiautomator.By;
-import android.view.KeyEvent;
-
-import org.junit.Test;
-
-public class ReactEventsTest extends BaseTest {
-
-	@Test
-	public void pressingMenuOpensDevMenu() throws Exception {
-		device().pressKeyCode(KeyEvent.KEYCODE_MENU);
-		assertExists(By.text("Debug JS Remotely"));
-	}
-
-	@Test
-	public void pressingRTwiceInSuccessionReloadsReactNative() throws Exception {
-		elementByText("PUSH").click();
-		assertExists(By.text("Pushed Screen"));
-
-		device().pressKeyCode(KeyEvent.KEYCODE_R);
-		device().pressKeyCode(KeyEvent.KEYCODE_R);
-		device().waitForIdle();
-		assertMainShown();
-	}
-
-	@Test
-	public void pressingRTwiceWithDelayDoesNothing() throws Exception {
-		elementByText("PUSH").click();
-		assertExists(By.text("Pushed Screen"));
-
-		device().pressKeyCode(KeyEvent.KEYCODE_R);
-		Thread.sleep(1500);
-		device().pressKeyCode(KeyEvent.KEYCODE_R);
-		assertExists(By.text("Pushed Screen"));
-	}
-}

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

@@ -35,6 +35,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
+		navigator.destroy();
 		app().getReactGateway().onActivityDestroyed(this);
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/layout/ReactRootViewController.java

@@ -59,9 +59,6 @@ public class ReactRootViewController extends ViewController {
 	@Override
 	protected View createView() {
 		reactRootView = new ReactRootView(getActivity());
-		Bundle opts = new Bundle();
-		opts.putString("containerId", getId());
-		reactRootView.startReactApplication(this.reactInstanceManager, this.name, opts);
 		reactRootView.setEventListener(new ReactRootView.ReactRootViewEventListener() {
 			@Override
 			public void onAttachedToReactInstance(final ReactRootView reactRootView) {
@@ -69,6 +66,9 @@ public class ReactRootViewController extends ViewController {
 				attachedToReactInstance = true;
 			}
 		});
+		final Bundle opts = new Bundle();
+		opts.putString("containerId", getId());
+		reactRootView.startReactApplication(this.reactInstanceManager, this.name, opts);
 		return reactRootView;
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -130,7 +130,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 	}
 
 	private void handle(Runnable task) {
-		if (activity() == null) return;
+		if (activity() == null || activity().isFinishing()) return;
 		UiThread.post(task);
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationReactInitializer.java

@@ -2,24 +2,20 @@ package com.reactnativenavigation.react;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.reactnativenavigation.NavigationActivity;
-import com.reactnativenavigation.utils.UiThread;
 
 public class NavigationReactInitializer implements ReactInstanceManager.ReactInstanceEventListener {
 
 	private final ReactInstanceManager reactInstanceManager;
 	private final DevPermissionRequest devPermissionRequest;
-	private final boolean isDebug;
 	private boolean waitingForAppLaunchEvent = true;
 
 	public NavigationReactInitializer(ReactInstanceManager reactInstanceManager, boolean isDebug) {
 		this.reactInstanceManager = reactInstanceManager;
 		this.devPermissionRequest = new DevPermissionRequest(isDebug);
-		this.isDebug = isDebug;
 	}
 
-	public void onActivityCreated(NavigationActivity activity) {
+	public void onActivityCreated(final NavigationActivity activity) {
 		reactInstanceManager.addReactInstanceEventListener(this);
 		waitingForAppLaunchEvent = true;
 	}
@@ -29,7 +25,7 @@ public class NavigationReactInitializer implements ReactInstanceManager.ReactIns
 			devPermissionRequest.askPermission(activity);
 		} else {
 			reactInstanceManager.onHostResume(activity, activity);
-			checkBundleThenPrepareReact(activity);
+			prepareReactApp();
 		}
 	}
 
@@ -46,29 +42,7 @@ public class NavigationReactInitializer implements ReactInstanceManager.ReactIns
 		}
 	}
 
-	private void checkBundleThenPrepareReact(final NavigationActivity activity) {
-		if (isDebug) {
-			reactInstanceManager.getDevSupportManager().isPackagerRunning(new PackagerStatusCallback() {
-				@Override
-				public void onPackagerStatusFetched(final boolean packagerIsRunning) {
-					UiThread.post(new Runnable() {
-						@Override
-						public void run() {
-							if (!packagerIsRunning) {
-								activity.toast("Packager is not running!");
-							} else {
-								prepareReactAppWithWorkingBundle();
-							}
-						}
-					});
-				}
-			});
-		} else {
-			prepareReactAppWithWorkingBundle();
-		}
-	}
-
-	private void prepareReactAppWithWorkingBundle() {
+	private void prepareReactApp() {
 		if (shouldCreateContext()) {
 			reactInstanceManager.createReactContextInBackground();
 		} else if (waitingForAppLaunchEvent) {

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationReactNativeHost.java

@@ -4,14 +4,11 @@ import android.app.Application;
 
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.devsupport.RedBoxHandler;
 import com.facebook.react.shell.MainReactPackage;
 
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 public class NavigationReactNativeHost extends ReactNativeHost {
 
 	private final boolean isDebug;
@@ -21,17 +18,6 @@ public class NavigationReactNativeHost extends ReactNativeHost {
 		this.isDebug = isDebug;
 	}
 
-	@Override
-	public String getJSMainModuleName() {
-		return super.getJSMainModuleName();
-	}
-
-	@Nullable
-	@Override
-	public RedBoxHandler getRedBoxHandler() {
-		return super.getRedBoxHandler();
-	}
-
 	@Override
 	public boolean getUseDeveloperSupport() {
 		return isDebug;

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -35,6 +35,12 @@ public class Navigator extends ParentController {
 		return root != null && root.handleBack();
 	}
 
+	@Override
+	public void destroy() {
+		modalStack.dismissAll();
+		super.destroy();
+	}
+
 	/*
 	 * Navigation methods
 	 */