expo 53.0.18 → 53.0.19

package/android/build.gradle

@@ -32,7 +32,7 @@ buildscript {
 def reactNativeVersion = project.extensions.getByType(ExpoModuleExtension).reactNativeVersion
 
 group = 'host.exp.exponent'
-version = '53.0.18'
+version = '53.0.19'
 
 expoModule {
   // We can't prebuild the module because it depends on the generated files.
@@ -43,7 +43,7 @@ android {
   namespace "expo.core"
   defaultConfig {
     versionCode 1
-    versionName "53.0.18"
+    versionName "53.0.19"
     consumerProguardFiles("proguard-rules.pro")
   }
   testOptions {

package/android/src/main/java/expo/modules/ReactActivityDelegateWrapper.kt

@@ -29,12 +29,13 @@ import expo.modules.core.interfaces.ReactActivityHandler.DelayLoadAppHandler
 import expo.modules.core.interfaces.ReactActivityLifecycleListener
 import expo.modules.kotlin.Utils
 import expo.modules.rncompatibility.ReactNativeFeatureFlags
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import java.lang.reflect.Field
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier
@@ -71,6 +72,14 @@ class ReactActivityDelegateWrapper(
    */
   private val loadAppReady = CompletableDeferred<Unit>()
 
+  /**
+   * A mutex to ensure all coroutines in a scope are running in atomic way.
+   *
+   * This is to act like [Activity] lifecycle,
+   * e.g. all work in [onResume] should be executed after all work in [onCreate] finished.
+   */
+  private val mutex = Mutex()
+
   /**
    * A [CoroutineScope] that binds its lifecycle as [ReactActivityDelegateWrapper].
    * This is used for [onDestroy] because we need a longer lifecycle scope to call [onDestroy]
@@ -110,7 +119,7 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun loadApp(appKey: String?) {
-    activity.lifecycleScope.launch(start = CoroutineStart.UNDISPATCHED) {
+    launchLifecycleScopeWithLock(start = CoroutineStart.UNDISPATCHED) {
       loadAppImpl(appKey, supportsDelayLoad = true)
     }
   }
@@ -138,7 +147,7 @@ class ReactActivityDelegateWrapper(
       // Instead we intercept `ReactActivityDelegate.onCreate` and replace the `mReactDelegate` with our version.
       // That's not ideal but works.
 
-      activity.lifecycleScope.launch(start = CoroutineStart.UNDISPATCHED) {
+      launchLifecycleScopeWithLock(start = CoroutineStart.UNDISPATCHED) {
         awaitDelayLoadAppWhenReady(delayLoadAppHandler)
         loadAppReady.complete(Unit)
 
@@ -184,7 +193,7 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun onResume() {
-    activity.lifecycleScope.launch {
+    launchLifecycleScopeWithLock {
       loadAppReady.await()
       delegate.onResume()
       reactActivityLifecycleListeners.forEach { listener ->
@@ -194,10 +203,7 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun onPause() {
-    activity.lifecycleScope.launch {
-      if (!loadAppReady.isCompleted) {
-        loadAppReady.completeExceptionally(CancellationException("Activity paused before app loaded"))
-      }
+    launchLifecycleScopeWithLock {
       loadAppReady.await()
       reactActivityLifecycleListeners.forEach { listener ->
         listener.onPause(activity)
@@ -219,7 +225,7 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun onUserLeaveHint() {
-    activity.lifecycleScope.launch {
+    launchLifecycleScopeWithLock {
       loadAppReady.await()
       reactActivityLifecycleListeners.forEach { listener ->
         listener.onUserLeaveHint(activity)
@@ -232,26 +238,24 @@ class ReactActivityDelegateWrapper(
     // Note: use our `coroutineScope` for onDestroy here
     // because the lifecycleScope destroyed before the executions.
     applicationCoroutineScope.launch {
-      if (!loadAppReady.isCompleted) {
-        // Cancel loadAppReady so any waiting coroutines are notified
-        loadAppReady.completeExceptionally(CancellationException("Activity destroyed before app loaded"))
-      }
-      loadAppReady.await()
-      reactActivityLifecycleListeners.forEach { listener ->
-        listener.onDestroy(activity)
-      }
-      if (delayLoadAppHandler != null) {
-        try {
-          // For the delay load case, we may enter a different call flow than react-native.
-          // For example, Activity stopped before delay load finished.
-          // We stop before the ReactActivityDelegate gets a chance to set up.
-          // In this case, we should catch the exceptions.
+      mutex.withLock {
+        loadAppReady.await()
+        reactActivityLifecycleListeners.forEach { listener ->
+          listener.onDestroy(activity)
+        }
+        if (delayLoadAppHandler != null) {
+          try {
+            // For the delay load case, we may enter a different call flow than react-native.
+            // For example, Activity stopped before delay load finished.
+            // We stop before the ReactActivityDelegate gets a chance to set up.
+            // In this case, we should catch the exceptions.
+            delegate.onDestroy()
+          } catch (e: Exception) {
+            Log.e(TAG, "Exception occurred during onDestroy with delayed app loading", e)
+          }
+        } else {
           delegate.onDestroy()
-        } catch (e: Exception) {
-          Log.e(TAG, "Exception occurred during onDestroy with delayed app loading", e)
         }
-      } else {
-        delegate.onDestroy()
       }
     }
   }
@@ -270,7 +274,7 @@ class ReactActivityDelegateWrapper(
      *
      * TODO (@bbarthec): fix it upstream?
      */
-    activity.lifecycleScope.launch {
+    launchLifecycleScopeWithLock {
       loadAppReady.await()
       if (!ReactNativeFeatureFlags.enableBridgelessArchitecture && delegate.reactInstanceManager.currentReactContext == null) {
         val reactContextListener = object : ReactInstanceEventListener {
@@ -279,7 +283,9 @@ class ReactActivityDelegateWrapper(
             delegate.onActivityResult(requestCode, resultCode, data)
           }
         }
-        return@launch delegate.reactInstanceManager.addReactInstanceEventListener(reactContextListener)
+        return@launchLifecycleScopeWithLock delegate.reactInstanceManager.addReactInstanceEventListener(
+          reactContextListener
+        )
       }
 
       delegate.onActivityResult(requestCode, resultCode, data)
@@ -342,21 +348,21 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun onWindowFocusChanged(hasFocus: Boolean) {
-    activity.lifecycleScope.launch {
+    launchLifecycleScopeWithLock {
       loadAppReady.await()
       delegate.onWindowFocusChanged(hasFocus)
     }
   }
 
   override fun requestPermissions(permissions: Array<out String>?, requestCode: Int, listener: PermissionListener?) {
-    activity.lifecycleScope.launch {
+    launchLifecycleScopeWithLock {
       loadAppReady.await()
       delegate.requestPermissions(permissions, requestCode, listener)
     }
   }
 
   override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>?, grantResults: IntArray?) {
-    activity.lifecycleScope.launch {
+    launchLifecycleScopeWithLock {
       loadAppReady.await()
       delegate.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
@@ -383,7 +389,7 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun onConfigurationChanged(newConfig: Configuration?) {
-    activity.lifecycleScope.launch {
+    launchLifecycleScopeWithLock {
       loadAppReady.await()
       delegate.onConfigurationChanged(newConfig)
     }
@@ -470,6 +476,17 @@ class ReactActivityDelegateWrapper(
     }
   }
 
+  private fun launchLifecycleScopeWithLock(
+    start: CoroutineStart = CoroutineStart.DEFAULT,
+    block: suspend CoroutineScope.() -> Unit
+  ) {
+    activity.lifecycleScope.launch(start = start) {
+      mutex.withLock {
+        block()
+      }
+    }
+  }
+
   /**
    * Set the [loadAppReady] to completed state.
    * This is only for unit tests when a test setups mocks and skips the [Activity] lifecycle.

package/android/src/test/java/expo/modules/ReactActivityDelegateWrapperDelayLoadTest.kt

@@ -173,60 +173,6 @@ internal class ReactActivityDelegateWrapperDelayLoadTest {
     verify(exactly = 1) { spyDelegate.onDestroy() }
   }
 
-  @Test
-  fun `should cancel pending resume if activity pause before delay load finished`() = runTest {
-    every { ExpoModulesPackage.Companion.packageList } returns listOf(mockPackageWithDelay)
-
-    val callbackSlot = slot<Runnable>()
-    every { delayLoadAppHandler.whenReady(capture(callbackSlot)) } answers {
-      // Don't call the callback immediately to simulate delay
-    }
-
-    activityController = Robolectric.buildActivity(MockActivity::class.java)
-      .also {
-        val activity = it.get()
-        (activity.application as MockApplication).bindCurrentActivity(activity)
-      }
-      .setup()
-    val spyDelegateWrapper = activity.reactActivityDelegate as ReactActivityDelegateWrapper
-    val spyDelegate = spyDelegateWrapper.delegate
-
-    verify(exactly = 1) { spyDelegateWrapper.onCreate(any()) }
-    verify(exactly = 1) { spyDelegateWrapper.onResume() }
-    verify(exactly = 0) { spyDelegate.onResume() }
-
-    activityController.pause()
-    callbackSlot.captured.run()
-    verify(exactly = 0) { spyDelegate.onResume() }
-  }
-
-  @Test
-  fun `should cancel pending resume if activity stop before delay load finished`() = runTest {
-    every { ExpoModulesPackage.Companion.packageList } returns listOf(mockPackageWithDelay)
-
-    val callbackSlot = slot<Runnable>()
-    every { delayLoadAppHandler.whenReady(capture(callbackSlot)) } answers {
-      // Don't call the callback immediately to simulate delay
-    }
-
-    activityController = Robolectric.buildActivity(MockActivity::class.java)
-      .also {
-        val activity = it.get()
-        (activity.application as MockApplication).bindCurrentActivity(activity)
-      }
-      .setup()
-    val spyDelegateWrapper = activity.reactActivityDelegate as ReactActivityDelegateWrapper
-    val spyDelegate = spyDelegateWrapper.delegate
-
-    verify(exactly = 1) { spyDelegateWrapper.onCreate(any()) }
-    verify(exactly = 1) { spyDelegateWrapper.onResume() }
-    verify(exactly = 0) { spyDelegate.onResume() }
-
-    activityController.pause().stop()
-    callbackSlot.captured.run()
-    verify(exactly = 0) { spyDelegate.onResume() }
-  }
-
   @Test
   fun `should cancel pending resume if activity destroy before delay load finished`() = runTest {
     every { ExpoModulesPackage.Companion.packageList } returns listOf(mockPackageWithDelay)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "53.0.18",
+  "version": "53.0.19",
   "description": "The Expo SDK",
   "main": "src/Expo.ts",
   "module": "src/Expo.ts",
@@ -73,9 +73,9 @@
   "homepage": "https://github.com/expo/expo/tree/main/packages/expo",
   "dependencies": {
     "@babel/runtime": "^7.20.0",
-    "@expo/cli": "0.24.19",
-    "@expo/config": "~11.0.12",
-    "@expo/config-plugins": "~10.1.1",
+    "@expo/cli": "0.24.20",
+    "@expo/config": "~11.0.13",
+    "@expo/config-plugins": "~10.1.2",
     "@expo/fingerprint": "0.13.4",
     "@expo/metro-config": "0.20.17",
     "@expo/vector-icons": "^14.0.0",
@@ -119,5 +119,5 @@
       "optional": true
     }
   },
-  "gitHead": "03398e0a2fa4f1bceebbf3a73c7bfb956a3ed18b"
+  "gitHead": "134c147ee4274f9688929ac66cfef950947659d0"
 }