Minor fixes to reload flow (#1103)

This is mostly a workaround to overcome faults in the simple event bus implementation,
also fixes crash when reloading while modal is displayed.

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

@@ -29,6 +29,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
     private final OnModalDismissedListener onModalDismissedListener;
     private final ScreenParams screenParams;
     private Layout layout;
+    private boolean isDestroyed;
 
     public void setTopBarVisible(String screenInstanceId, boolean hidden, boolean animated) {
         layout.setTopBarVisible(screenInstanceId, hidden, animated);
@@ -149,6 +150,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
 
     @Override
     public void destroy() {
+        isDestroyed = true;
         layout.destroy();
     }
 
@@ -161,6 +163,9 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
 
     @Override
     public void onDismiss(DialogInterface dialog) {
+        if (isDestroyed) {
+            return;
+        }
         destroy();
         setOrientation(AppStyle.appStyle.orientation);
         onModalDismissedListener.onModalDismissed(this);

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

@@ -361,7 +361,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         if (event.getType().equals(ModalDismissedEvent.TYPE)) {
             handleModalDismissedEvent();
         } else if (event.getType().equals(JsDevReloadEvent.TYPE)) {
-            handleJsDevReloadEvent();
+            postHandleJsDevReloadEvent();
         }
     }
 
@@ -375,9 +375,14 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         return modalController.isShowing() ? modalController.getWindow() : getWindow();
     }
 
-    private void handleJsDevReloadEvent() {
-        modalController.destroy();
-        layout.destroy();
+    private void postHandleJsDevReloadEvent() {
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                layout.destroy();
+                modalController.destroy();
+            }
+        });
     }
 
     @TargetApi(Build.VERSION_CODES.M)

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

@@ -5,20 +5,20 @@ import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.devsupport.ReactInstanceDevCommandsHandler;
 import com.reactnativenavigation.utils.ReflectionUtils;
 
-public class JsDevReloadListenerReplacer {
+class JsDevReloadListenerReplacer {
     private final ReactInstanceManager reactInstanceManager;
     private final Listener listener;
 
-    public interface Listener {
+    interface Listener {
         void onJsDevReload();
     }
 
-    public JsDevReloadListenerReplacer(ReactInstanceManager reactInstanceManager, Listener listener) {
+    JsDevReloadListenerReplacer(ReactInstanceManager reactInstanceManager, Listener listener) {
         this.reactInstanceManager = reactInstanceManager;
         this.listener = listener;
     }
 
-    public void replace() {
+    void replace() {
         ReactInstanceDevCommandsHandler originalHandler = getOriginalHandler();
         DevCommandsHandlerProxy proxy = new DevCommandsHandlerProxy(originalHandler, listener);
         replaceInReactInstanceManager(proxy);
@@ -42,7 +42,7 @@ public class JsDevReloadListenerReplacer {
         private ReactInstanceDevCommandsHandler originalReactHandler;
         private final Listener listener;
 
-        public DevCommandsHandlerProxy(ReactInstanceDevCommandsHandler originalReactHandler, Listener listener) {
+        DevCommandsHandlerProxy(ReactInstanceDevCommandsHandler originalReactHandler, Listener listener) {
             this.originalReactHandler = originalReactHandler;
             this.listener = listener;
         }