rr to reload js, passed e2e

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

@@ -4,13 +4,11 @@ import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.reactnativenavigation.NavigationActivity;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class NavigationReactInitializer {
+public class NavigationReactInitializer implements ReactInstanceManager.ReactInstanceEventListener {
 
 	private final ReactInstanceManager reactInstanceManager;
 	private final DevPermissionRequest devPermissionRequest;
-	private final AtomicBoolean appLaunchEmitted = new AtomicBoolean(false);
+	private boolean waitingForAppLaunchEvent = true;
 
 	public NavigationReactInitializer(ReactInstanceManager reactInstanceManager, boolean isDebug) {
 		this.reactInstanceManager = reactInstanceManager;
@@ -18,7 +16,7 @@ public class NavigationReactInitializer {
 	}
 
 	public void onActivityCreated(NavigationActivity activity) {
-		appLaunchEmitted.set(false);
+		waitingForAppLaunchEvent = true;
 	}
 
 	public void onActivityResumed(NavigationActivity activity) {
@@ -37,43 +35,32 @@ public class NavigationReactInitializer {
 	}
 
 	public void onActivityDestroyed(NavigationActivity activity) {
+		reactInstanceManager.removeReactInstanceEventListener(this);
 		if (reactInstanceManager.hasStartedCreatingInitialContext()) {
 			reactInstanceManager.onHostDestroy(activity);
 		}
 	}
 
 	private void prepareReactApp() {
+		reactInstanceManager.addReactInstanceEventListener(this);
 		if (shouldCreateContext()) {
-			appLaunchEmitted.set(false);
-			createReactContext(new Runnable() {
-				@Override
-				public void run() {
-					emitAppLaunchedOnceIfNeeded();
-				}
-			});
-		} else {
-			emitAppLaunchedOnceIfNeeded();
+			reactInstanceManager.createReactContextInBackground();
+		} else if (waitingForAppLaunchEvent) {
+			emitAppLaunched();
 		}
 	}
 
-	private void emitAppLaunchedOnceIfNeeded() {
-		if (appLaunchEmitted.compareAndSet(false, true)) {
-			new NavigationEvent(reactInstanceManager.getCurrentReactContext()).appLaunched();
-		}
-	}
-
-	private void createReactContext(final Runnable onComplete) {
-		reactInstanceManager.addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
-			@Override
-			public void onReactContextInitialized(final ReactContext context) {
-				reactInstanceManager.removeReactInstanceEventListener(this);
-				onComplete.run();
-			}
-		});
-		reactInstanceManager.createReactContextInBackground();
+	private void emitAppLaunched() {
+		waitingForAppLaunchEvent = false;
+		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).appLaunched();
 	}
 
 	private boolean shouldCreateContext() {
 		return !reactInstanceManager.hasStartedCreatingInitialContext();
 	}
+
+	@Override
+	public void onReactContextInitialized(final ReactContext context) {
+		emitAppLaunched();
+	}
 }

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

@@ -1,18 +1,13 @@
 package com.reactnativenavigation.react;
 
-import com.facebook.react.devsupport.DevSupportManager;
-import com.facebook.react.devsupport.DevSupportManagerImpl;
-import com.facebook.react.devsupport.ReactInstanceDevCommandsHandler;
-import com.facebook.react.devsupport.RedBoxHandler;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.utils.ReflectionUtils;
 
 public class ReactGateway {
 
-	public interface JsReloadListener {
-		void onJsReload();
-	}
+//	public interface JsReloadListener {
+//		void onJsReload();
+//	}
 
 	private final NavigationReactNativeHost reactNativeHost;
 	private final NavigationReactInitializer initializer;
@@ -21,21 +16,28 @@ public class ReactGateway {
 	public ReactGateway(final NavigationApplication application, final boolean isDebug) {
 		reactNativeHost = new NavigationReactNativeHost(application, isDebug);
 
-		DevSupportManager devSupportManager = reactNativeHost.getReactInstanceManager().getDevSupportManager();
-		ReactInstanceDevCommandsHandler reactInstanceCommandsHandler = (ReactInstanceDevCommandsHandler) ReflectionUtils.getDeclaredField(devSupportManager, "mReactInstanceCommandsHandler");
-		String packagerPathForJsBundle = reactNativeHost.getJSMainModuleName();
-		boolean enableOnCreate = reactNativeHost.getUseDeveloperSupport();
-		RedBoxHandler redBoxHandler = reactNativeHost.getRedBoxHandler();
-		DevSupportManagerImpl proxy = new DevSupportManagerImpl(application, reactInstanceCommandsHandler, packagerPathForJsBundle, enableOnCreate, redBoxHandler) {
-			@Override
-			public void handleReloadJS() {
-				super.handleReloadJS();
-				// onJsReload
+//		DevSupportManager devSupportManager = reactNativeHost.getReactInstanceManager().getDevSupportManager();
+//		ReactInstanceDevCommandsHandler reactInstanceCommandsHandler = (ReactInstanceDevCommandsHandler) ReflectionUtils.getDeclaredField(devSupportManager, "mReactInstanceCommandsHandler");
+//		String packagerPathForJsBundle = reactNativeHost.getJSMainModuleName();
+//		boolean enableOnCreate = reactNativeHost.getUseDeveloperSupport();
+//		RedBoxHandler redBoxHandler = reactNativeHost.getRedBoxHandler();
+//		DevSupportManagerImpl proxy = new DevSupportManagerImpl(application, reactInstanceCommandsHandler, packagerPathForJsBundle, enableOnCreate, redBoxHandler) {
+//			@Override
+//			public void handleReloadJS() {
+//				super.handleReloadJS();
+//
+//
+//				// onJsReload
 //				ReactContext currentReactContext = reactNativeHost.getReactInstanceManager().getCurrentReactContext();
-//				((NavigationActivity) currentReactContext.getCurrentActivity()).getNavigator().onDestroy();
-			}
-		};
-		ReflectionUtils.setField(reactNativeHost.getReactInstanceManager(), "mDevSupportManager", proxy);
+//				if (currentReactContext != null) {
+//					NavigationActivity activity = (NavigationActivity) currentReactContext.getCurrentActivity();
+//					if (activity != null) {
+//						activity.reset();
+//					}
+//				}
+//			}
+//		};
+//		ReflectionUtils.setField(reactNativeHost.getReactInstanceManager(), "mDevSupportManager", proxy);
 
 		initializer = new NavigationReactInitializer(reactNativeHost.getReactInstanceManager(), isDebug);
 		jsDevReloadHandler = new JsDevReloadHandler(reactNativeHost.getReactInstanceManager());