Move eventEmitter to NavigationReactInstance

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

@@ -5,9 +5,7 @@ import android.os.Handler;
 import android.support.annotation.NonNull;
 
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.shell.MainReactPackage;
-import com.reactnativenavigation.bridge.NavigationReactEventEmitter;
 import com.reactnativenavigation.bridge.NavigationReactPackage;
 import com.reactnativenavigation.react.NavigationReactInstance;
 
@@ -18,7 +16,6 @@ public abstract class NavigationApplication extends Application {
 
     public static NavigationApplication instance;
     private NavigationReactInstance navigationReactInstance;
-    private NavigationReactEventEmitter reactEventEmitter;
     private Handler handler;
 
     @Override
@@ -30,18 +27,6 @@ public abstract class NavigationApplication extends Application {
         navigationReactInstance.startReactContextOnceInBackgroundAndExecuteJS();
     }
 
-    public NavigationReactEventEmitter getReactEventEmitter() {
-        if (reactEventEmitter == null) {
-            reactEventEmitter = new NavigationReactEventEmitter(getCurrentReactContext());
-        }
-
-        return reactEventEmitter;
-    }
-
-    private ReactContext getCurrentReactContext() {
-        return navigationReactInstance.getReactInstanceManager().getCurrentReactContext();
-    }
-
     public Handler getMainHandler() {
         return handler;
     }

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

@@ -7,11 +7,12 @@ import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.bridge.NavigationReactEventEmitter;
 import com.reactnativenavigation.controllers.NavigationActivity;
 
 public class NavigationReactInstance {
-
     private final ReactInstanceManager reactInstanceManager;
+    private NavigationReactEventEmitter reactEventEmitter;
     private OnJsDevReloadListener onJsDevReloadListener;
 
     public interface OnJsDevReloadListener {
@@ -50,7 +51,8 @@ public class NavigationReactInstance {
     }
 
     public void onPause() {
-        this.onJsDevReloadListener = null;
+        onJsDevReloadListener = null;
+        reactEventEmitter = null;
         reactInstanceManager.onHostPause();
     }
 
@@ -82,4 +84,12 @@ public class NavigationReactInstance {
 
         return builder.build();
     }
+
+    public NavigationReactEventEmitter getReactEventEmitter() {
+        if (reactEventEmitter == null) {
+            reactEventEmitter = new NavigationReactEventEmitter(reactInstanceManager.getCurrentReactContext());
+        }
+
+        return reactEventEmitter;
+    }
 }

android/app/src/main/java/com/reactnativenavigation/views/TitleBarButton.java

@@ -93,7 +93,11 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 
     @Override
     public boolean onMenuItemClick(MenuItem item) {
-        NavigationApplication.instance.getReactEventEmitter().sendEvent(buttonParams.eventId, navigatorEventId);
+        NavigationApplication.
+                instance.
+                getNavigationReactInstance().
+                getReactEventEmitter().
+                sendEvent(buttonParams.eventId, navigatorEventId);
         return true;
     }
 }