detox 20.14.4-prerelease.0 → 20.14.4-smoke.0

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0-javadoc.jar.md5

@@ -0,0 +1 @@
+3d0b64bdd6e7a436ee911d1418503a6d

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0-javadoc.jar.sha1

@@ -0,0 +1 @@
+6635f90d741216b5aa76b5032514ba9784e4c671

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0-javadoc.jar.sha256

@@ -0,0 +1 @@
+b4b6831643b10e07a874aa90546f704478697908361c10679b4fb03f070ea287

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0-javadoc.jar.sha512

@@ -0,0 +1 @@
+335d6a60ba8ac361a6404f631e0a2b1ba07a1e823dfe606fc35d28100516bd2a0eb727097d9c648b801192d6f5a0fcc61c6435a8e459ba0c7d83de435af4b255

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0-sources.jar.md5

@@ -0,0 +1 @@
+f5c0348c6cf33679d63e5f79a4cb7be9

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0-sources.jar.sha1

@@ -0,0 +1 @@
+4289a96b2a89d2d1ac3299142c65d7cbe7f7126d

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0-sources.jar.sha256

@@ -0,0 +1 @@
+e8f3230b45eb8950baa3400408ef9e21a5d0d61275fb63bffdfa11f97298a68f

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0-sources.jar.sha512

@@ -0,0 +1 @@
+f3420efb7574cee763513971f8a6753d72ad2aa47a479a825f321ae8c3bf98680b42bf5d9c1c37edcf6aa8528581a65ac8ee2ea0ef0f04682a5c693d2397eb62

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0.aar.md5

@@ -0,0 +1 @@
+070f7c4048400fe1d6b1599414f5c7f1

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0.aar.sha1

@@ -0,0 +1 @@
+52ebf8f7cd97ab4d28216ce8504635be1f74b57c

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0.aar.sha256

@@ -0,0 +1 @@
+42299d1835b5db9fe3b7523d2d656a8834fff583ae82521ff69b9e050814ce3a

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0.aar.sha512

@@ -0,0 +1 @@
+aeecbc2448822395dc7d9674c0a30f5cffd9cacd8361bd55a1a4f0bb8cafe82cb812fbe1da890395cfcc65439dcb4666e119a356a054c582cb7dfe225fb9d858

package/Detox-android/com/wix/detox/{20.14.4-prerelease.0/detox-20.14.4-prerelease.0.pom → 20.14.4-smoke.0/detox-20.14.4-smoke.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.14.4-prerelease.0</version>
+  <version>20.14.4-smoke.0</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.4-smoke.0/detox-20.14.4-smoke.0.pom.md5

@@ -0,0 +1 @@
+0fc89c4edda6315cb57a7cf8e97f90dc

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0.pom.sha1

@@ -0,0 +1 @@
+f3fe5b9e1063318f207d7c185d19ecbe21a84f6d

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0.pom.sha256

@@ -0,0 +1 @@
+ba3399fb186167a3d399cb00c12f39db8597fc00c5ca269e6ae98fd8af8dd4eb

package/Detox-android/com/wix/detox/20.14.4-smoke.0/detox-20.14.4-smoke.0.pom.sha512

@@ -0,0 +1 @@
+34e9d1dc0267749af9e4cba6899b3c75e0275f16edca353e9d52fbc07a8f1582aeebead081595c7794fd8bbb37680870e7281a9f4d249be3de73dec508a41ce8

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.14.4-prerelease.0</latest>
-    <release>20.14.4-prerelease.0</release>
+    <latest>20.14.4-smoke.0</latest>
+    <release>20.14.4-smoke.0</release>
     <versions>
-      <version>20.14.4-prerelease.0</version>
+      <version>20.14.4-smoke.0</version>
     </versions>
-    <lastUpdated>20231220153927</lastUpdated>
+    <lastUpdated>20231221025706</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-5c1d4e12b1f2f774d7def161e3e3f9fd
+891c5308c9e49fc080cb14e82d7e6919

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

@@ -1 +1 @@
-521a576afd0a6a16928fa14bc3617db7c115a3bb
+30bbc998cdcd5633acd13644f592f971a142dc3f

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

@@ -1 +1 @@
-d55edad08d5fd0a9b2a1b5be751106328267e2dd68874a1d6132dcdad7ec07ac
+b12dc7fa9e99b2896286d020a9d7386a8321f19c8a1e6872dbf51d40ae4d45f7

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

@@ -1 +1 @@
-161ddacaad8efff1a7023cc0bc8d6ba62333aed51b3a93994415fba1ead902d165e87c8b9d57f73c3b148c601c26a97b791b583a96001103a49e307954f0a4d5
+39aeb05537af1b3f2b2124fe5c0775c21f6a682770ee478874a0c845cea3ccf4a68bbab568d0249a1942d5be71edc0d05355484018cdb93da4fadc733a82de23

package/android/detox/proguard-rules-app.pro

@@ -20,5 +20,4 @@
 -keep class kotlin.io.** { *; }
 -keep class okhttp3.** { *; }
 
--keep class androidx.concurrent.futures.CallbackToFutureAdapter$* { *; }
--keep class androidx.concurrent.futures.CallbackToFutureAdapter { *; }
+-keep class androidx.concurrent.futures.** { *; }

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/NotificationDataParser.kt

@@ -5,7 +5,7 @@ import com.wix.detox.common.JsonConverter
 import com.wix.detox.common.TextFileReader
 import org.json.JSONObject
 
-class NotificationDataParser(private val notificationPath: String) {
+internal class NotificationDataParser(private val notificationPath: String) {
     fun toBundle(): Bundle {
         val rawData = readNotificationFromFile()
         val json = JSONObject(rawData)

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/android/detox/src/testFull/java/com/wix/detox/espresso/matcher/RegexMatcherTest.kt

@@ -3,7 +3,10 @@ package com.wix.detox.espresso.matcher
 import org.junit.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
+@RunWith(RobolectricTestRunner::class)
 class RegexMatcherTest {
     @Test
     fun `should work with string matching regex`() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.14.4-prerelease.0",
+  "version": "20.14.4-smoke.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -109,5 +109,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "5823eb3647890266afea3fd2282c216184929b46"
+  "gitHead": "cef00d5518934c10b512869ee716be753e20cad6"
 }

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.4-prerelease.0/detox-20.14.4-prerelease.0-javadoc.jar.md5

@@ -1 +0,0 @@
-29bc4777777762cb4415a3f708ebfaa3

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-d1fb1fd9948721e2962638d6a291aaf3dd76f664

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-27c5d79abbbfb83d77067e0961e13952e14efed610c9326d8344df6ad59c318c

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-bd730da8c7bba1d17654de9d04520084ccd666cd0122751453dc4626658be02b0dba78217b5a85aa4f14a1e3e8e83a432bd6cb42abc8ca086837f49579c39112

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0-sources.jar.md5

@@ -1 +0,0 @@
-48088df60d4c8d80199db3da4af847ee

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0-sources.jar.sha1

@@ -1 +0,0 @@
-f78ab572fa5eb4d80e736a09ef248b3aefdc3e49

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0-sources.jar.sha256

@@ -1 +0,0 @@
-1fa998d82cc17386743596ef3ef401ee9f2297c40f6ad5f0e62bbde1b479ae6a

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0-sources.jar.sha512

@@ -1 +0,0 @@
-229659e5fa1a88fe9f5764fed0b45388d347848c4702c7d7530d5f9db662b39d04ecd7d38450947fc2c54c2761adf3e98ea8f683dec119771ded207b8928cebf

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0.aar.md5

@@ -1 +0,0 @@
-c27920150917efb5b25878186e904fe0

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0.aar.sha1

@@ -1 +0,0 @@
-ad9e12738ca3c82606a58bacea6d50b51687aee9

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0.aar.sha256

@@ -1 +0,0 @@
-ab07c0011f9cee612e5b56ea42618978b75a5cfff9841766fc3f796e730c3571

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0.aar.sha512

@@ -1 +0,0 @@
-a26f964a1ef775262740a23fbbeca9e5754a5da7896bcab22a476f684d40168b67ad4a97087a1f6fe484343e70eb32063adfeac3a2879f887e8d7fc616e6eacc

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0.pom.md5

@@ -1 +0,0 @@
-d2944af61d45243912e839416e58f2b8

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0.pom.sha1

@@ -1 +0,0 @@
-b65e1c75082be225692c4613416d5a34449b9975

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0.pom.sha256

@@ -1 +0,0 @@
-3c7f5e26e9752fbb0bb622460ce95cb2dd619cf121a453e0062424e2b7d6c2bc

package/Detox-android/com/wix/detox/20.14.4-prerelease.0/detox-20.14.4-prerelease.0.pom.sha512

@@ -1 +0,0 @@
-d6444af9c9dda33104b686473cfa6978d1696bc13f6a7f1611ae15ffc920b52a068b15ab82f8222a499f8d59b4645d643487a4878979cd5f2f26ce1b2a0dff9d

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

@@ -1,78 +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
-    @JvmOverloads constructor(
-        private val activityTestRule: ActivityTestRule<*>,
-        private val launchArgs: LaunchArgs = LaunchArgs(),
-        private val intentsFactory: LaunchIntentsFactory = LaunchIntentsFactory(),
-        private val notificationDataParserGen: (String) -> NotificationDataParser = { path -> NotificationDataParser(path) }
-) {
-    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 = notificationDataParserGen(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 = notificationDataParserGen(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)")
-        }
-    }
-}

package/android/detox/src/testFull/java/com/wix/detox/ActivityLaunchHelperTest.kt

@@ -1,111 +0,0 @@
-package com.wix.detox
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import org.mockito.kotlin.*
-import androidx.test.rule.ActivityTestRule
-import org.junit.runner.RunWith
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.Before
-import org.junit.Test
-import org.mockito.ArgumentMatchers.anyBoolean
-import org.mockito.ArgumentMatchers.anyString
-import org.robolectric.RobolectricTestRunner
-
-@RunWith(RobolectricTestRunner::class)
-class ActivityLaunchHelperTest {
-
-    private val initialURL = "detox://unit-test"
-    private val bundleExtraLaunchArgs = "launchArgs"
-    private val notificationPath = "path/to/notification.data"
-
-    private lateinit var intent: Intent
-    private lateinit var launchArgsAsBundle: Bundle
-    private lateinit var notificationDataAsBundle: Bundle
-    private lateinit var testRule: ActivityTestRule<Activity>
-    private lateinit var launchArgs: LaunchArgs
-    private lateinit var intentsFactory: LaunchIntentsFactory
-    private lateinit var notificationDataParser: NotificationDataParser
-
-    private fun uut() = ActivityLaunchHelper(testRule, launchArgs, intentsFactory, { notificationDataParser })
-
-    @Before
-    fun setup() {
-        intent = Intent()
-        launchArgsAsBundle = mock()
-        notificationDataAsBundle = mock()
-
-        testRule = mock()
-        launchArgs = mock() {
-            on { asIntentBundle() }.thenReturn(launchArgsAsBundle)
-        }
-        intentsFactory = mock()
-        notificationDataParser = mock() {
-            on { toBundle() }.thenReturn(notificationDataAsBundle)
-        }
-    }
-
-    @Test
-    fun `default-activity -- should launch using test rule, with a clean intent`() {
-        givenCleanLaunch()
-        uut().launchActivityUnderTest()
-        verify(testRule).launchActivity(eq(intent))
-    }
-
-    @Test
-    fun `default-activity -- should apply launch args to intent`() {
-        givenCleanLaunch()
-        uut().launchActivityUnderTest()
-        assertIntentHasLaunchArgs()
-    }
-
-    @Test
-    fun `default activity, with a url -- should launch based on the url`() {
-        givenLaunchWithInitialURL()
-        uut().launchActivityUnderTest()
-        verify(testRule).launchActivity(eq(intent))
-        verify(intentsFactory).intentWithUrl(initialURL, true)
-    }
-
-    @Test
-    fun `default activity, with a url -- should apply launch args to intent`() {
-        givenLaunchWithInitialURL()
-        uut().launchActivityUnderTest()
-        assertIntentHasLaunchArgs()
-    }
-
-    @Test
-    fun `default activity, with notification data -- should launch with the data as bundle`() {
-        givenLaunchWithNotificationData()
-        uut().launchActivityUnderTest()
-        verify(testRule).launchActivity(eq(intent))
-        verify(intentsFactory).intentWithNotificationData(any(), eq(notificationDataAsBundle), eq(true))
-    }
-
-    @Test
-    fun `default activity, with notification data -- should apply launch args to intent`() {
-        givenLaunchWithNotificationData()
-        uut().launchActivityUnderTest()
-        assertIntentHasLaunchArgs()
-    }
-
-    private fun givenCleanLaunch() {
-        whenever(intentsFactory.cleanIntent()).thenReturn(intent)
-    }
-    private fun givenLaunchWithInitialURL() {
-        whenever(launchArgs.hasUrlOverride()).thenReturn(true)
-        whenever(launchArgs.urlOverride).thenReturn(initialURL)
-        whenever(intentsFactory.intentWithUrl(anyString(), anyBoolean())).thenReturn(intent)
-    }
-    private fun givenLaunchWithNotificationData() {
-        whenever(launchArgs.hasNotificationPath()).thenReturn(true)
-        whenever(launchArgs.notificationPath).thenReturn(notificationPath)
-        whenever(intentsFactory.intentWithNotificationData(any(), any(), anyBoolean()))
-            .thenReturn(intent)
-    }
-    private fun assertIntentHasLaunchArgs() {
-        assertThat(intent.hasExtra(bundleExtraLaunchArgs)).isTrue
-        assertThat(intent.getBundleExtra(bundleExtraLaunchArgs)).isEqualTo(launchArgsAsBundle)
-    }
-}