detox 20.14.1 → 20.14.2

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2-javadoc.jar.md5

@@ -0,0 +1 @@
+83e2c044c4a8a80da67d2142bbf15047

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2-javadoc.jar.sha1

@@ -0,0 +1 @@
+8ccd5b34260ca721f645624dfcc00f79562b56c7

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2-javadoc.jar.sha256

@@ -0,0 +1 @@
+084644c2e162c2735fa8a1402ca042202859f58c8596d49f484634b13e583763

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2-javadoc.jar.sha512

@@ -0,0 +1 @@
+85c49763108219fee733c5a84e44aac4a5b2ebcaec9d969cb743f9628d9411050683dd464b64d126b2275f607da7f8da8c98199246538c55ef805361f1f054b1

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2-sources.jar.md5

@@ -0,0 +1 @@
+72c8a46b258d5502226964690e6f2124

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2-sources.jar.sha1

@@ -0,0 +1 @@
+6b00e943e255c1a1522f2b3249a639ea815a18ed

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2-sources.jar.sha256

@@ -0,0 +1 @@
+716fe252a3e939dfa01dfaeedc483b67ee7d42786cbdc920dd7140b12d575af7

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2-sources.jar.sha512

@@ -0,0 +1 @@
+8187b89fb5e5c5100ce26d97cd4103342fc9ebb2f2583b12826d02bf17c8a7f34be016037624d6f8992e8b78ab25435da145d5404bc2796fc741dd3e04272ce9

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2.aar.md5

@@ -0,0 +1 @@
+5037d89ac5d98e47d69d63b8731e7e3a

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2.aar.sha1

@@ -0,0 +1 @@
+b4a0f9db575d92cb2da51c617e0ff531330cc2c6

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2.aar.sha256

@@ -0,0 +1 @@
+1fa253115965db1c97bc6c8b0c1ab0dff9ac9f8714e063dc972332cc6798b63a

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2.aar.sha512

@@ -0,0 +1 @@
+8174914ad6abe68c79f4812a32d292e80d922239045a30401bc39f43801f3cd2ea2807786248ffb58e84dfcdb8eddc00c7f606a874eb216def9350d325442af3

package/Detox-android/com/wix/detox/{20.14.1/detox-20.14.1.pom → 20.14.2/detox-20.14.2.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.14.1</version>
+  <version>20.14.2</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2.pom.md5

@@ -0,0 +1 @@
+d66f5511d730ae3148f66ce7e2c16c76

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2.pom.sha1

@@ -0,0 +1 @@
+2f6d1547f9c0706d24c68995162ae99bda38cb67

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2.pom.sha256

@@ -0,0 +1 @@
+6006602d31121b42160842f61b249dd3696c81c9552681709aae5a123b22699d

package/Detox-android/com/wix/detox/20.14.2/detox-20.14.2.pom.sha512

@@ -0,0 +1 @@
+52f8b1ab28ac1bf3970a19aba1930ffbd310836e8e480a066a9bd4ff99727baf5f7fc1ac882019b59245dff846fe2d39bc9173e26d3ff5d1a77c442c00782ee2

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.14.1</latest>
-    <release>20.14.1</release>
+    <latest>20.14.2</latest>
+    <release>20.14.2</release>
     <versions>
-      <version>20.14.1</version>
+      <version>20.14.2</version>
     </versions>
-    <lastUpdated>20231212155320</lastUpdated>
+    <lastUpdated>20231218160804</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-3e4214cc64c1e5edc2a3032be61a5545
+c12d39148c8df6c732259787182f39c9

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-0196bb30f6b15f7ca321049999448d9242cc34fb
+c87af74eb1bb58f0acc0c0b95cb000d33ff185db

package/Detox-android/com/wix/detox/maven-metadata.xml.sha256

@@ -1 +1 @@
-00f7fa47240f24b4188f773b9652d64f1e08a0dd32fdf918ab48b7e56215909b
+f7f6fbf308504c7b02ec391f800e5d0f816b2e1be07a5fca83164947c3a80b2a

package/Detox-android/com/wix/detox/maven-metadata.xml.sha512

@@ -1 +1 @@
-ac2fac1e5878e4d303daa66ed9174cb6bbb4304fcc1ddbc30dad48e47a9ac87106e849fb1d85bdcbb32a6d5955cff4b7a47a341a0203ca040d40bb852019e312
+7bbcaf76b676ecae74a22f94447d62fe9212b2ead9c5dafe0fd5dfaed470b914948e58fb6dd898a9ea90ac9da3ae2bf08e19b88d626220d4baa6f218efc2d872

package/android/detox/src/full/java/com/wix/detox/Detox.java

@@ -1,13 +1,18 @@
 package com.wix.detox;
 
+import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.wix.detox.config.DetoxConfig;
+import com.wix.detox.espresso.UiControllerSpy;
 
 import androidx.annotation.NonNull;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
-import com.wix.detox.config.DetoxConfig;
-
 /**
  * <p>Static class.</p>
  *
@@ -62,7 +67,12 @@ import com.wix.detox.config.DetoxConfig;
  * <p>If not set, then Detox tests are no ops. So it's safe to mix it with other tests.</p>
  */
 public final class Detox {
-    private static ActivityLaunchHelper sActivityLaunchHelper;
+    private static final String INTENT_LAUNCH_ARGS_KEY = "launchArgs";
+    private static final long ACTIVITY_LAUNCH_TIMEOUT = 10000L;
+
+    private static final LaunchArgs sLaunchArgs = new LaunchArgs();
+    private static final LaunchIntentsFactory sIntentsFactory = new LaunchIntentsFactory();
+    private static ActivityTestRule sActivityTestRule;
 
     private Detox() {
     }
@@ -122,20 +132,72 @@ public final class Detox {
         DetoxConfig.CONFIG = detoxConfig;
         DetoxConfig.CONFIG.apply();
 
-        sActivityLaunchHelper = new ActivityLaunchHelper(activityTestRule);
-        DetoxMain.run(context, sActivityLaunchHelper);
+        sActivityTestRule = activityTestRule;
+
+        UiControllerSpy.attachThroughProxy();
+
+        Intent intent = extractInitialIntent();
+        sActivityTestRule.launchActivity(intent);
+
+        try {
+            DetoxMain.run(context);
+        } catch (Exception e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("Detox got interrupted prematurely", e);
+        }
     }
 
     public static void launchMainActivity() {
-        sActivityLaunchHelper.launchMainActivity();
+        final Activity activity = sActivityTestRule.getActivity();
+        launchActivitySync(sIntentsFactory.activityLaunchIntent(activity));
     }
 
     public static void startActivityFromUrl(String url) {
-        sActivityLaunchHelper.startActivityFromUrl(url);
+        launchActivitySync(sIntentsFactory.intentWithUrl(url, false));
     }
 
     public static void startActivityFromNotification(String dataFilePath) {
-        sActivityLaunchHelper.startActivityFromNotification(dataFilePath);
+        Bundle notificationData = new NotificationDataParser(dataFilePath).toBundle();
+        Intent intent = sIntentsFactory.intentWithNotificationData(getAppContext(), notificationData, false);
+        launchActivitySync(intent);
+    }
+
+    private static Intent extractInitialIntent() {
+        Intent intent;
+
+        if (sLaunchArgs.hasUrlOverride()) {
+            intent = sIntentsFactory.intentWithUrl(sLaunchArgs.getUrlOverride(), true);
+        } else if (sLaunchArgs.hasNotificationPath()) {
+            Bundle notificationData = new NotificationDataParser(sLaunchArgs.getNotificationPath()).toBundle();
+            intent = sIntentsFactory.intentWithNotificationData(getAppContext(), notificationData, true);
+        } else {
+            intent = sIntentsFactory.cleanIntent();
+        }
+        intent.putExtra(INTENT_LAUNCH_ARGS_KEY, sLaunchArgs.asIntentBundle());
+        return intent;
+    }
+
+    private static void launchActivitySync(Intent intent) {
+        // Ideally, we would just call sActivityTestRule.launchActivity(intent) and get it over with.
+        // BUT!!! as it turns out, Espresso has an issue where doing this for an activity running in the background
+        // would have Espresso set up an ActivityMonitor which will spend its time waiting for the activity to load, *without
+        // ever being released*. It will finally fail after a 45 seconds timeout.
+        // Without going into full details, it seems that activity test rules were not meant to be used this way. However,
+        // the all-new ActivityScenario implementation introduced in androidx could probably support this (e.g. by using
+        // dedicated methods such as moveToState(), which give better control over the lifecycle).
+        // In any case, this is the core reason for this issue: https://github.com/wix/Detox/issues/1125
+        // What it forces us to do, then, is this -
+        // 1. Launch the activity by "ourselves" from the OS (i.e. using context.startActivity()).
+        // 2. Set up an activity monitor by ourselves -- such that it would block until the activity is ready.
+        // ^ Hence the code below.
+
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        final Activity activity = sActivityTestRule.getActivity();
+        final Instrumentation.ActivityMonitor activityMonitor = new Instrumentation.ActivityMonitor(activity.getClass().getName(), null, true);
+
+        activity.startActivity(intent);
+        instrumentation.addMonitor(activityMonitor);
+        instrumentation.waitForMonitorWithTimeout(activityMonitor, ACTIVITY_LAUNCH_TIMEOUT);
     }
 
     private static Context getAppContext() {

package/android/detox/src/full/java/com/wix/detox/DetoxMain.kt

@@ -3,62 +3,35 @@ package com.wix.detox
 import android.content.Context
 import android.util.Log
 import com.wix.detox.adapters.server.*
-import com.wix.detox.common.DetoxLog
-import com.wix.detox.espresso.UiControllerSpy
+import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
 import com.wix.detox.instruments.DetoxInstrumentsManager
 import com.wix.detox.reactnative.ReactNativeExtension
 import com.wix.invoke.MethodInvocation
-import java.util.concurrent.CountDownLatch
 
+private const val INIT_ACTION = "_init"
+private const val IS_READY_ACTION = "isReady"
 private const val TERMINATION_ACTION = "_terminate"
 
 object DetoxMain {
-    private val handshakeLock = CountDownLatch(1)
-
     @JvmStatic
-    fun run(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
+    fun run(rnHostHolder: Context) {
         val detoxServerInfo = DetoxServerInfo()
+        Log.i(LOG_TAG, "Detox server connection details: $detoxServerInfo")
+
         val testEngineFacade = TestEngineFacade()
         val actionsDispatcher = DetoxActionsDispatcher()
-        val serverAdapter = DetoxServerAdapter(actionsDispatcher, detoxServerInfo, TERMINATION_ACTION)
-
-        initCrashHandler(serverAdapter)
-        initANRListener(serverAdapter)
-        initEspresso()
-        initReactNative()
-
-        setupActionHandlers(actionsDispatcher, serverAdapter, testEngineFacade, rnHostHolder)
-        serverAdapter.connect()
-
-        launchActivityOnCue(rnHostHolder, activityLaunchHelper)
+        val externalAdapter = DetoxServerAdapter(actionsDispatcher, detoxServerInfo, IS_READY_ACTION, TERMINATION_ACTION)
+        initActionHandlers(actionsDispatcher, externalAdapter, testEngineFacade, rnHostHolder)
+        actionsDispatcher.dispatchAction(INIT_ACTION, "", 0)
         actionsDispatcher.join()
     }
 
-    /**
-     * Launch the tested activity "on cue", namely, right after a connection is established and the handshake
-     * completes successfully.
-     *
-     * This has to be synchronized so that an `isReady` isn't handled *before* the activity is launched (albeit not fully
-     * initialized - all native modules and everything) and a react context is available.
-     *
-     * As a better alternative, it would make sense to execute this as a simple action from within the actions
-     * dispatcher (i.e. handler of `loginSuccess`), in which case, no inter-thread locking would be required
-     * thanks to the usage of Handlers. However, in this type of a solution, errors / crashes would be reported
-     * not by instrumentation itself, but based on the `AppWillTerminateWithError` message; In it's own, it is a good
-     * thing, but for a reason we're not sure of yet, it is ignored by the test runner at this point in the flow.
-     */
-    @Synchronized
-    private fun launchActivityOnCue(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
-        awaitHandshake()
-        launchActivity(rnHostHolder, activityLaunchHelper)
-    }
-
-    private fun awaitHandshake() {
-        handshakeLock.await()
-    }
+    private fun doInit(externalAdapter: DetoxServerAdapter, rnHostHolder: Context) {
+        externalAdapter.connect()
 
-    private fun onLoginSuccess() {
-        handshakeLock.countDown()
+        initCrashHandler(externalAdapter)
+        initANRListener(externalAdapter)
+        initReactNativeIfNeeded(rnHostHolder)
     }
 
     private fun doTeardown(serverAdapter: DetoxServerAdapter, actionsDispatcher: DetoxActionsDispatcher, testEngineFacade: TestEngineFacade) {
@@ -68,28 +41,35 @@ object DetoxMain {
         actionsDispatcher.teardown()
     }
 
-    private fun setupActionHandlers(actionsDispatcher: DetoxActionsDispatcher, serverAdapter: DetoxServerAdapter, testEngineFacade: TestEngineFacade, rnHostHolder: Context) {
-        class SynchronizedActionHandler(private val actionHandler: DetoxActionHandler): DetoxActionHandler {
-            override fun handle(params: String, messageId: Long) {
-                synchronized(this@DetoxMain) {
-                    actionHandler.handle(params, messageId)
-                }
-            }
-        }
-
+    private fun initActionHandlers(actionsDispatcher: DetoxActionsDispatcher, serverAdapter: DetoxServerAdapter, testEngineFacade: TestEngineFacade, rnHostHolder: Context) {
         // Primary actions
         with(actionsDispatcher) {
-            val readyHandler = SynchronizedActionHandler( ReadyActionHandler(serverAdapter, testEngineFacade) )
-            val rnReloadHandler = SynchronizedActionHandler( ReactNativeReloadActionHandler(rnHostHolder, serverAdapter, testEngineFacade) )
+            val rnReloadHandler = ReactNativeReloadActionHandler(rnHostHolder, serverAdapter, testEngineFacade)
 
-            associateActionHandler("loginSuccess", ::onLoginSuccess)
-            associateActionHandler("isReady", readyHandler)
-            associateActionHandler("reactNativeReload", rnReloadHandler)
+            associateActionHandler(INIT_ACTION, object : DetoxActionHandler {
+                override fun handle(params: String, messageId: Long) =
+                    synchronized(this@DetoxMain) {
+                        this@DetoxMain.doInit(serverAdapter, rnHostHolder)
+                    }
+            })
+            associateActionHandler(IS_READY_ACTION, ReadyActionHandler(serverAdapter, testEngineFacade))
+
+            associateActionHandler("loginSuccess", ScarceActionHandler())
+            associateActionHandler("reactNativeReload", object: DetoxActionHandler {
+                override fun handle(params: String, messageId: Long) =
+                    synchronized(this@DetoxMain) {
+                        rnReloadHandler.handle(params, messageId)
+                    }
+            })
             associateActionHandler("invoke", InvokeActionHandler(MethodInvocation(), serverAdapter))
             associateActionHandler("cleanup", CleanupActionHandler(serverAdapter, testEngineFacade) {
                 dispatchAction(TERMINATION_ACTION, "", 0)
             })
-            associateActionHandler(TERMINATION_ACTION) { -> doTeardown(serverAdapter, actionsDispatcher, testEngineFacade) }
+            associateActionHandler(TERMINATION_ACTION, object: DetoxActionHandler {
+                override fun handle(params: String, messageId: Long) {
+                    this@DetoxMain.doTeardown(serverAdapter, actionsDispatcher, testEngineFacade)
+                }
+            })
 
             if (DetoxInstrumentsManager.supports()) {
                 val instrumentsManager = DetoxInstrumentsManager(rnHostHolder)
@@ -100,8 +80,13 @@ object DetoxMain {
 
         // Secondary actions
         with(actionsDispatcher) {
-            val queryStatusHandler = SynchronizedActionHandler( QueryStatusActionHandler(serverAdapter, testEngineFacade) )
-            associateSecondaryActionHandler("currentStatus", queryStatusHandler)
+            val queryStatusHandler = QueryStatusActionHandler(serverAdapter, testEngineFacade)
+            associateActionHandler("currentStatus", object: DetoxActionHandler {
+                override fun handle(params: String, messageId: Long) =
+                    synchronized(this@DetoxMain) {
+                        queryStatusHandler.handle(params, messageId)
+                    }
+            }, false)
         }
     }
 
@@ -113,17 +98,7 @@ object DetoxMain {
         DetoxANRHandler(outboundServerAdapter).attach()
     }
 
-    private fun initEspresso() {
-        UiControllerSpy.attachThroughProxy()
-    }
-
-    private fun initReactNative() {
-        ReactNativeExtension.initIfNeeded()
-    }
-
-    private fun launchActivity(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
-        Log.i(DetoxLog.LOG_TAG, "Launching the tested activity!")
-        activityLaunchHelper.launchActivityUnderTest()
+    private fun initReactNativeIfNeeded(rnHostHolder: Context) {
         ReactNativeExtension.waitForRNBootstrap(rnHostHolder)
     }
 }

package/android/detox/src/full/java/com/wix/detox/LaunchIntentsFactory.kt

@@ -6,7 +6,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 
-class LaunchIntentsFactory {
+internal class LaunchIntentsFactory {
 
     /**
      * Constructs an intent tightly associated with a specific activity.

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxActionHandlers.kt

@@ -152,3 +152,7 @@ class InstrumentsEventsActionsHandler(
         outboundServerAdapter.sendMessage("eventDone", emptyMap<String, Any>(), messageId)
     }
 }
+
+class ScarceActionHandler: DetoxActionHandler {
+    override fun handle(params: String, messageId: Long) {}
+}

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxActionsDispatcher.kt

@@ -11,18 +11,11 @@ class DetoxActionsDispatcher {
     private val primaryExec = ActionsExecutor("detox.primary")
     private val secondaryExec = ActionsExecutor("detox.secondary")
 
-    fun associateActionHandler(type: String, actionHandler: DetoxActionHandler) =
-        associateActionHandler(type, actionHandler, true)
-
-    fun associateActionHandler(type: String, handlerFunc: () -> Unit) {
-        associateActionHandler(type, object: DetoxActionHandler {
-            override fun handle(params: String, messageId: Long) = handlerFunc()
-        })
+    fun associateActionHandler(type: String, actionHandler: DetoxActionHandler, isPrimary: Boolean = true) {
+        val actionsExecutor = (if (isPrimary) primaryExec else secondaryExec)
+        actionsExecutor.associateHandler(type, actionHandler)
     }
 
-    fun associateSecondaryActionHandler(type: String, actionHandler: DetoxActionHandler) =
-        associateActionHandler(type, actionHandler, false)
-
     fun dispatchAction(type: String, params: String, messageId: Long) {
         (primaryExec.executeAction(type, params, messageId) ||
             secondaryExec.executeAction(type, params, messageId))
@@ -40,11 +33,6 @@ class DetoxActionsDispatcher {
         primaryExec.join()
         secondaryExec.join()
     }
-
-    private fun associateActionHandler(type: String, actionHandler: DetoxActionHandler, isPrimary: Boolean = true) {
-        val actionsExecutor = (if (isPrimary) primaryExec else secondaryExec)
-        actionsExecutor.associateHandler(type, actionHandler)
-    }
 }
 
 private class ActionsExecutor(name: String) {
@@ -86,5 +74,7 @@ private class ActionsExecutor(name: String) {
         handler.looper.quit()
     }
 
-    fun join() = thread.join()
+    fun join() {
+        thread.join()
+    }
 }

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxServerAdapter.kt

@@ -10,6 +10,7 @@ interface OutboundServerAdapter {
 class DetoxServerAdapter(
         private val actionsDispatcher: DetoxActionsDispatcher,
         private val detoxServerInfo: DetoxServerInfo,
+        private val readyActionType: String,
         private val terminationActionType: String)
     : WebSocketClient.WSEventsHandler, OutboundServerAdapter {
 
@@ -26,6 +27,7 @@ class DetoxServerAdapter(
 
     override fun onConnect() {
         Log.i(DetoxLog.LOG_TAG, "Connected to server!")
+        actionsDispatcher.dispatchAction(readyActionType, "", -1000L)
     }
 
     override fun onClosed() {

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxServerInfo.kt

@@ -1,9 +1,7 @@
 package com.wix.detox.adapters.server
 
-import android.util.Log
 import androidx.test.platform.app.InstrumentationRegistry
 import com.wix.detox.LaunchArgs
-import com.wix.detox.common.DetoxLog
 
 private const val DEFAULT_URL = "ws://localhost:8099"
 
@@ -11,7 +9,7 @@ class DetoxServerInfo internal constructor(launchArgs: LaunchArgs = LaunchArgs()
     val serverUrl: String = launchArgs.detoxServerUrl ?: DEFAULT_URL
     val sessionId: String = launchArgs.detoxSessionId ?: InstrumentationRegistry.getInstrumentation().targetContext.applicationInfo.packageName
 
-    init {
-        Log.i(DetoxLog.LOG_TAG, "Detox server connection details: url=$serverUrl, sessionId=$sessionId")
+    override fun toString(): String {
+        return "url=$serverUrl, sessionId=$sessionId"
     }
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeExtension.kt

@@ -14,31 +14,6 @@ private const val LOG_TAG = "DetoxRNExt"
 object ReactNativeExtension {
     private var rnIdlingResources: ReactNativeIdlingResources? = null
 
-    fun initIfNeeded() {
-        if (!ReactNativeInfo.isReactNativeApp()) {
-            return
-        }
-
-        ReactMarkersLogger.attach()
-    }
-
-    /**
-     * Wait for React-Native to finish loading (i.e. make RN context available).
-     *
-     * @param applicationContext The app context, implicitly assumed to be a [ReactApplication] instance.
-     */
-    fun waitForRNBootstrap(applicationContext: Context) {
-        if (!ReactNativeInfo.isReactNativeApp()) {
-            return
-        }
-
-        (applicationContext as ReactApplication).let {
-            val reactContext = awaitNewReactNativeContext(it, null)
-
-            enableOrDisableSynchronization(reactContext)
-        }
-    }
-
     /**
      * Reloads the React Native context and thus all javascript code.
      *
@@ -65,6 +40,26 @@ object ReactNativeExtension {
             val reactContext = awaitNewReactNativeContext(it, previousReactContext)
 
             enableOrDisableSynchronization(reactContext, networkSyncEnabled)
+            hackRN50OrHigherWaitForReady()
+        }
+    }
+
+    /**
+     * Wait for React-Native to finish loading (i.e. make RN context available).
+     *
+     * @param applicationContext The app context, implicitly assumed to be a [ReactApplication] instance.
+     */
+    @JvmStatic
+    fun waitForRNBootstrap(applicationContext: Context) {
+        if (!ReactNativeInfo.isReactNativeApp()) {
+            return
+        }
+
+        (applicationContext as ReactApplication).let {
+            val reactContext = awaitNewReactNativeContext(it, null)
+
+            enableOrDisableSynchronization(reactContext)
+            hackRN50OrHigherWaitForReady()
         }
     }
 
@@ -150,6 +145,18 @@ object ReactNativeExtension {
         }
     }
 
+    private fun hackRN50OrHigherWaitForReady() {
+        if (ReactNativeInfo.rnVersion().minor in 50..62) {
+            try {
+                //TODO- Temp hack to make Detox usable for RN>=50 till we find a better sync solution.
+                Thread.sleep(1000)
+            } catch (e: InterruptedException) {
+                e.printStackTrace()
+            }
+
+        }
+    }
+
     private fun clearIdlingResources() {
         rnIdlingResources?.unregisterAll()
         rnIdlingResources = null

package/android/detox/src/main/java/com/wix/detox/espresso/UiControllerSpy.kt

@@ -11,8 +11,11 @@ class UiControllerSpy: MethodsSpy("uiController") {
     fun eventInjectionsIterator(): Iterator<CallInfo?> = historyOf("injectMotionEvent").iterator()
 
     companion object {
+        @JvmStatic
         val instance = UiControllerSpy()
 
+        @JvmStatic
+        @JvmOverloads
         fun attachThroughProxy(spy: UiControllerSpy = instance) {
             val eventsInjectorReflected = EventsInjectorReflected(getUiController())
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.14.1",
+  "version": "20.14.2",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -109,5 +109,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "1512e9aa473d2c8fccdbaa11cc6b642c5eb17cfe"
+  "gitHead": "281536e93191a2d88bf7bd591b6ee95c316f817b"
 }

package/src/android/espressoapi/Detox.js

@@ -58,6 +58,17 @@ class Detox {
     };
   }
 
+  static extractInitialIntent() {
+    return {
+      target: {
+        type: "Class",
+        value: "com.wix.detox.Detox"
+      },
+      method: "extractInitialIntent",
+      args: []
+    };
+  }
+
   static getAppContext() {
     return {
       target: {

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-javadoc.jar.md5

@@ -1 +0,0 @@
-df336477c5bb07869456e1a65d69d5c7

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-javadoc.jar.sha1

@@ -1 +0,0 @@
-aaa63a4199f17a89c7e884202ca33554cf0c4410

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-javadoc.jar.sha256

@@ -1 +0,0 @@
-fe1c75ae0cbabeeb848ffb9e80b591b6f6f2d37c899e05717a58d967748f4860

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-javadoc.jar.sha512

@@ -1 +0,0 @@
-4e2f5bc2efecc31716ae9e70a2e87da45ebcda42a0f4d8d192ae7f2c68ad1f801e3758590be3d2bb3f8bd4a44dbed255e2a4f95abc2f9c44bd9d4879520ac51d

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-sources.jar.md5

@@ -1 +0,0 @@
-3ee1d9a4a119b7c6627434ad73e41638

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-sources.jar.sha1

@@ -1 +0,0 @@
-4a270aaa691aa23b7b14ae32e77cb56de9cfdc95

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-sources.jar.sha256

@@ -1 +0,0 @@
-47099e074808fb5626c109b5b09c464cabd9cad5c2844cdc98a1868e2b10238a

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1-sources.jar.sha512

@@ -1 +0,0 @@
-c4c1f64a63da6e106ca90cfcab4e8d095d0f97c4341e6f3a54203116438264e1e2e262f3e2278b064b3283d4bbbddad88afc48c8d9a5f8bf410e0cc653c307f0

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.aar.md5

@@ -1 +0,0 @@
-5802af204da6a4e44339eb5b544e816d

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.aar.sha1

@@ -1 +0,0 @@
-530bd1ee5be0479b9d48b33722b521ef408d82b7

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.aar.sha256

@@ -1 +0,0 @@
-4efd5d50625590c576c69a3a722d8df776fa213cff6e1fa254ec429d4db6fb58

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.aar.sha512

@@ -1 +0,0 @@
-19b779508bf7d9059f23fd638114bb817eee061bf018fcf793b451f63b3c5d8519e20f85fceffa61863d59244f168692d1e4e8d861be979200a2130c4486b9e8

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.pom.md5

@@ -1 +0,0 @@
-fdbbf729d55d7657238f4ffdfdf21b18

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.pom.sha1

@@ -1 +0,0 @@
-2ee22e6f82bbbd550d383530de9ac1403e716dbc

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.pom.sha256

@@ -1 +0,0 @@
-9522ff285942a4332b1602849b17fa910d603dd019c4cbcc454e8c2a64b0859d

package/Detox-android/com/wix/detox/20.14.1/detox-20.14.1.pom.sha512

@@ -1 +0,0 @@
-1ff01de68f6d101e206f63bab0e67e93492a2c3661d3f763f08d4acbf647c207e095f74a9bfbb7b55a7faacf6545ed130037085258c7869fee01f80a45ecf7f1

package/android/detox/src/full/java/com/wix/detox/ActivityLaunchHelper.kt

@@ -1,76 +0,0 @@
-package com.wix.detox
-
-import android.app.Instrumentation.ActivityMonitor
-import android.content.Context
-import android.content.Intent
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.ActivityTestRule
-
-class ActivityLaunchHelper(private val activityTestRule: ActivityTestRule<*>) {
-
-    private val launchArgs = LaunchArgs()
-    private val intentsFactory = LaunchIntentsFactory()
-
-    fun launchActivityUnderTest() {
-        val intent = extractInitialIntent()
-        activityTestRule.launchActivity(intent)
-    }
-
-    fun launchMainActivity() {
-        val activity = activityTestRule.activity
-        launchActivitySync(intentsFactory.activityLaunchIntent(activity))
-    }
-
-    fun startActivityFromUrl(url: String) {
-        launchActivitySync(intentsFactory.intentWithUrl(url, false))
-    }
-
-    fun startActivityFromNotification(dataFilePath: String) {
-        val notificationData = NotificationDataParser(dataFilePath!!).toBundle()
-        val intent = intentsFactory.intentWithNotificationData(appContext, notificationData, false)
-        launchActivitySync(intent)
-    }
-
-    private fun extractInitialIntent(): Intent =
-        if (launchArgs.hasUrlOverride()) {
-            intentsFactory.intentWithUrl(launchArgs.urlOverride, true)
-        } else if (launchArgs.hasNotificationPath()) {
-            val notificationData = NotificationDataParser(launchArgs.notificationPath).toBundle()
-            intentsFactory.intentWithNotificationData(appContext, notificationData, true)
-        } else {
-            intentsFactory.cleanIntent()
-        }.also {
-            it.putExtra(INTENT_LAUNCH_ARGS_KEY, launchArgs.asIntentBundle())
-        }
-
-    private fun launchActivitySync(intent: Intent) {
-        // Ideally, we would just call sActivityTestRule.launchActivity(intent) and get it over with.
-        // BUT!!! as it turns out, Espresso has an issue where doing this for an activity running in the background
-        // would have Espresso set up an ActivityMonitor which will spend its time waiting for the activity to load, *without
-        // ever being released*. It will finally fail after a 45 seconds timeout.
-        // Without going into full details, it seems that activity test rules were not meant to be used this way. However,
-        // the all-new ActivityScenario implementation introduced in androidx could probably support this (e.g. by using
-        // dedicated methods such as moveToState(), which give better control over the lifecycle).
-        // In any case, this is the core reason for this issue: https://github.com/wix/Detox/issues/1125
-        // What it forces us to do, then, is this -
-        // 1. Launch the activity by "ourselves" from the OS (i.e. using context.startActivity()).
-        // 2. Set up an activity monitor by ourselves -- such that it would block until the activity is ready.
-        // ^ Hence the code below.
-        val activity = activityTestRule.activity
-        val activityMonitor = ActivityMonitor(activity.javaClass.name, null, true)
-        activity.startActivity(intent)
-
-        InstrumentationRegistry.getInstrumentation().run {
-            addMonitor(activityMonitor)
-            waitForMonitorWithTimeout(activityMonitor, ACTIVITY_LAUNCH_TIMEOUT)
-        }
-    }
-
-    private val appContext: Context
-        get() = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
-
-    companion object {
-        private const val INTENT_LAUNCH_ARGS_KEY = "launchArgs"
-        private const val ACTIVITY_LAUNCH_TIMEOUT = 10000L
-    }
-}

package/android/detox/src/full/java/com/wix/detox/reactnative/ReactMarkersLogger.kt

@@ -1,44 +0,0 @@
-package com.wix.detox.reactnative
-
-import android.util.Log
-import com.facebook.react.bridge.ReactMarker
-import com.facebook.react.bridge.ReactMarkerConstants
-import com.facebook.react.bridge.ReactMarkerConstants.*
-
-object ReactMarkersLogger : ReactMarker.MarkerListener {
-
-    fun attach() {
-        ReactMarker.addListener(this)
-    }
-
-    override fun logMarker(marker: ReactMarkerConstants, p1: String?, p2: Int) {
-        when {
-            marker == DOWNLOAD_START ||
-            marker == DOWNLOAD_END ||
-            marker == BUILD_REACT_INSTANCE_MANAGER_START ||
-            marker == BUILD_REACT_INSTANCE_MANAGER_END ||
-            marker == REACT_BRIDGE_LOADING_START ||
-            marker == REACT_BRIDGE_LOADING_END ||
-            marker == REACT_BRIDGELESS_LOADING_START ||
-            marker == REACT_BRIDGELESS_LOADING_END ||
-            marker == CREATE_MODULE_START ||
-            marker == CREATE_MODULE_END ||
-            marker == NATIVE_MODULE_SETUP_START ||
-            marker == NATIVE_MODULE_SETUP_END ||
-            marker == PRE_RUN_JS_BUNDLE_START ||
-            marker == RUN_JS_BUNDLE_START ||
-            marker == RUN_JS_BUNDLE_END ||
-            marker == CONTENT_APPEARED ||
-            marker == CREATE_CATALYST_INSTANCE_START ||
-            marker == CREATE_CATALYST_INSTANCE_END ||
-            marker == DESTROY_CATALYST_INSTANCE_START ||
-            marker == DESTROY_CATALYST_INSTANCE_END ||
-            marker == CREATE_REACT_CONTEXT_START ||
-            marker == CREATE_REACT_CONTEXT_END ||
-            marker == PROCESS_PACKAGES_START ||
-            marker == PROCESS_PACKAGES_END ||
-                false ->
-                Log.d("Detox.RNMarker", "$marker ($p1)")
-        }
-    }
-}