Destroy navigation activity layouts on catalyst instance destroy (#3318)

Destroy navigation activity layouts on catalyst instance destroy addresses #2331 & microsoft/react-native-code-push#1144
wix · Oct 14, 2018 · 5e2b02c · 5e2b02c
1 parent e61b3cb
commit 5e2b02c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java b/android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java
@@ -9,6 +9,7 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.reactnativenavigation.controllers.NavigationActivity;
 import com.reactnativenavigation.controllers.NavigationCommandsHandler;
 import com.reactnativenavigation.params.ContextualMenuParams;
 import com.reactnativenavigation.params.FabParams;
@@ -53,6 +54,12 @@ public String getName() {
         return NAME;
     }
 
+    @Override
+    public void onCatalystInstanceDestroy() {
+        super.onCatalystInstanceDestroy();
+        NavigationActivity.onCatalystInstanceDestroy();
+    }
+
     @ReactMethod
     public void startApp(final ReadableMap params, final @Nullable Promise promise) {
         NavigationCommandsHandler.startApp(BundleConverter.toBundle(params), promise);

diff --git a/android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java b/android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java
@@ -499,6 +499,20 @@ public static void setStartAppPromise(Promise promise) {
         NavigationActivity.startAppPromise = promise;
     }
 
+    public static void onCatalystInstanceDestroy() {
+        if (currentActivity == null) {
+            return;
+        }
+        currentActivity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (currentActivity != null) {
+                    currentActivity.destroyLayouts();
+                }
+            }
+        });
+    }
+
     public Layout getLayout() {
         return layout;
     }