✅ Regenerate Android Container system test fixture

electrode-io · Oct 25, 2018 · 060c602 · 060c602
1 parent aa96146
commit 060c602
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/...ainer/lib/src/main/java/com/walmartlabs/ern/container/ElectrodeReactActivityDelegate.java b/...ainer/lib/src/main/java/com/walmartlabs/ern/container/ElectrodeReactActivityDelegate.java
@@ -18,7 +18,9 @@
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.PermissionListener;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Nullable;
@@ -54,7 +56,7 @@ public void invokeDefaultOnBackPressed() {
     /**
      * List of ReactRootView(s) holding the view containing the ReactNative application(s)
      */
-    private Map<String, ReactRootView> mReactRootViews = new HashMap<>();
+    private final Map<String, ReactRootView> mReactRootViews = new HashMap<>();
 
     /**
      * Call this constructor if you are having one activity hosting one react native application.
@@ -318,11 +320,15 @@ private Activity getPlainActivity() {
         return ((Activity) getContext());
     }
 
-    private void unMountReactApplications() {
-        for (Map.Entry<String, ReactRootView> entry : mReactRootViews.entrySet()) {
-            ReactRootView rootView = entry.getValue();
-            rootView.unmountReactApplication();
+     private void unMountReactApplications() {
+        List<ReactRootView> list;
+        synchronized (mReactRootViews) {
+            list = new ArrayList<>(mReactRootViews.values());
+            mReactRootViews.clear();
+        }
+
+        for (ReactRootView reactRootView : list) {
+            reactRootView.unmountReactApplication();
         }
-        mReactRootViews.clear();
     }
 }