Ensure main thread when getting instanceManager (wix#681)

(cherry picked from commit a9b204e)
Skyscanner · Apr 23, 2018 · c81b9c2 · c81b9c2
1 parent 5e51d2c
commit c81b9c2
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/detox/android/detox/src/main/java/com/wix/detox/ReactNativeSupport.java b/detox/android/detox/src/main/java/com/wix/detox/ReactNativeSupport.java
@@ -88,18 +88,33 @@ static boolean isReactNativeApp() {
      */
     public static Object getInstanceManager(@NonNull Object reactNativeHostHolder) {
         Object instanceManager = null;
-        try {
-            instanceManager = Reflect.on(reactNativeHostHolder)
-                    .call(METHOD_GET_RN_HOST)
-                    .call(METHOD_GET_INSTANCE_MANAGER)
-                    .get();
-        } catch (ReflectException e) {
-            Log.e(LOG_TAG, "Problem calling getInstanceManager()", e.getCause());
+        // If we are not in main thread and instanceManager has not been created, creation will fail
+        if (Looper.getMainLooper().getThread() == Thread.currentThread()) {
+            try {
+                instanceManager = Reflect.on(reactNativeHostHolder)
+                        .call(METHOD_GET_RN_HOST)
+                        .call(METHOD_GET_INSTANCE_MANAGER)
+                        .get();
+            } catch (ReflectException e) {
+                Log.e(LOG_TAG, "Problem calling getInstanceManager()", e.getCause());
+            }
+        } else {
+            instanceManager = getInstanceManagerFromOtherThread(reactNativeHostHolder);
         }
-
         return instanceManager;
     }
 
+    private static Object getInstanceManagerFromOtherThread(@NonNull final Object reactNativeHostHolder) {
+        final Object[] instanceManager = {null};
+        InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                instanceManager[0] = getInstanceManager(reactNativeHostHolder);
+            }
+        });
+        return instanceManager[0];
+    }
+
     /**
      * <p>
      * Reloads the React Native application.