expo-updates 1.0.0-canary-20241021-7aba813 → 1.0.0-canary-20250122-166c2cb

package/CHANGELOG.md

@@ -4,6 +4,89 @@
 
 ### 🛠 Breaking changes
 
+- Remove a few long-deprecated typescript types. ([#34215](https://github.com/expo/expo/pull/34215) by [@wschurman](https://github.com/wschurman))
+
+### 🎉 New features
+
+- Add new state machine context about startup procedure. ([#32433](https://github.com/expo/expo/pull/32433) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- Fix an issue where `launchFallbackUpdateFromDisk` is called from a foreground thread leading to ANRs. ([#33693](https://github.com/expo/expo/pull/33693) by [@alanjhughes](https://github.com/alanjhughes))
+- [android] Use more robust mechanism for determining empty multipart bodies. ([#33977](https://github.com/expo/expo/pull/33977) by [@wschurman](https://github.com/wschurman))
+
+### 💡 Others
+
+- [iOS] Inject logger from controllers down to dependent objects. ([#34035](https://github.com/expo/expo/pull/34035) by [@wschurman](https://github.com/wschurman))
+
+## 0.26.10 - 2024-12-05
+
+### 🐛 Bug fixes
+
+- Fix black screen appearing instead of the splashscreen on launch. ([#33432](https://github.com/expo/expo/pull/33432) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 0.26.9 — 2024-11-22
+
+### 🐛 Bug fixes
+
+- Fixed `Inconsistent JVM-target compatibility` error when building with JDK 21. ([#33148](https://github.com/expo/expo/pull/33148) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Introduced `ReactNativeFeatureFlags` compat to fix React Native 0.77 breaking changes. ([#33077](https://github.com/expo/expo/pull/33077) by [@kudo](https://github.com/kudo))
+
+## 0.26.8 — 2024-11-20
+
+_This version does not introduce any user-facing changes._
+
+## 0.26.7 — 2024-11-14
+
+_This version does not introduce any user-facing changes._
+
+## 0.26.6 — 2024-11-13
+
+### 💡 Others
+
+- Upgrade `express` to `4.21.1` for `send`. ([#32852](https://github.com/expo/expo/pull/32852) by [@MWein](https://github.com/MWein))
+
+## 0.26.5 — 2024-11-07
+
+_This version does not introduce any user-facing changes._
+
+## 0.26.4 — 2024-11-04
+
+### 🐛 Bug fixes
+
+- Improve web native module interface completeness ([#32512](https://github.com/expo/expo/pull/32512) by [@wschurman](https://github.com/wschurman))
+
+## 0.26.3 — 2024-10-31
+
+_This version does not introduce any user-facing changes._
+
+## 0.26.2 — 2024-10-24
+
+### 🐛 Bug fixes
+
+- Move event emitting responsibility to module. ([#32248](https://github.com/expo/expo/pull/32248) by [@wschurman](https://github.com/wschurman))
+
+### 💡 Others
+
+- Use enum event in OnStartObserving and OnStopObserving. ([#32252](https://github.com/expo/expo/pull/32252) by [@wschurman](https://github.com/wschurman))
+
+## 0.26.1 — 2024-10-22
+
+### 🐛 Bug fixes
+
+- Fixed Android launch crash when R8 is enabled. ([#32226](https://github.com/expo/expo/pull/32226) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Fixed updates E2E tests. ([#32226](https://github.com/expo/expo/pull/32226) by [@kudo](https://github.com/kudo))
+
+## 0.26.0 — 2024-10-22
+
+### 🛠 Breaking changes
+
 - Bumped iOS and tvOS deployment target to 15.1. ([#30840](https://github.com/expo/expo/pull/30840) by [@tsapeta](https://github.com/tsapeta))
 
 ### 🎉 New features

package/android/build.gradle

@@ -16,11 +16,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.google.devtools.ksp'
 
 group = 'host.exp.exponent'
-version = '0.25.14'
+version = '0.26.9'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
 applyKotlinExpoModulesCorePlugin()
+applyKspJvmToolchain()
 useCoreDependencies()
 useDefaultAndroidSdkVersions()
 useExpoPublishing()
@@ -62,7 +63,7 @@ android {
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '0.25.14'
+    versionName '0.26.9'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

package/android/proguard-rules.pro

@@ -3,5 +3,5 @@
 }
 
 -keepclassmembers class com.facebook.react.devsupport.ReleaseDevSupportManager {
-  private final com.facebook.react.bridge.DefaultJSExceptionHandler mDefaultJSExceptionHandler;
+  private final com.facebook.react.bridge.DefaultJSExceptionHandler defaultJSExceptionHandler;
 }

package/android/src/main/java/expo/modules/updates/UpdatesController.kt

@@ -2,7 +2,7 @@ package expo.modules.updates
 
 import android.content.Context
 import com.facebook.react.ReactApplication
-import expo.modules.kotlin.events.EventEmitter
+import expo.modules.updates.events.IUpdatesEventManagerObserver
 import expo.modules.updates.loader.LoaderTask
 import expo.modules.updates.logging.UpdatesErrorCode
 import expo.modules.updates.logging.UpdatesLogger
@@ -151,13 +151,13 @@ class UpdatesController {
       }
     }
 
-    internal fun onEventListenerStartObserving(eventEmitter: EventEmitter?) {
-      singletonInstance?.eventManager?.eventEmitter = eventEmitter
+    internal fun setUpdatesEventManagerObserver(observer: WeakReference<IUpdatesEventManagerObserver>) {
+      singletonInstance?.eventManager?.observer = observer
       singletonInstance?.onEventListenerStartObserving()
     }
 
-    internal fun onEventListenerStopObserving() {
-      singletonInstance?.eventManager?.eventEmitter = null
+    internal fun removeUpdatesEventManagerObserver() {
+      singletonInstance?.eventManager?.observer = null
     }
   }
 }

package/android/src/main/java/expo/modules/updates/UpdatesModule.kt

@@ -8,19 +8,26 @@ import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
-import expo.modules.updates.events.UpdatesJSEvent
+import expo.modules.kotlin.types.Enumerable
+import expo.modules.updates.events.IUpdatesEventManagerObserver
 import expo.modules.updates.logging.UpdatesErrorCode
 import expo.modules.updates.logging.UpdatesLogEntry
 import expo.modules.updates.logging.UpdatesLogReader
 import expo.modules.updates.logging.UpdatesLogger
+import expo.modules.updates.statemachine.UpdatesStateContext
+import java.lang.ref.WeakReference
 import java.util.Date
 
+enum class UpdatesJSEvent(val eventName: String) : Enumerable {
+  StateChange("Expo.nativeUpdatesStateChangeEvent")
+}
+
 /**
  * Exported module which provides to the JS runtime information about the currently running update
  * and updates state, along with methods to check for and download new updates, reload with the
  * newest downloaded update applied, and read/clear native log entries.
  */
-class UpdatesModule : Module() {
+class UpdatesModule : Module(), IUpdatesEventManagerObserver {
   private val logger: UpdatesLogger
     get() = UpdatesLogger(context)
 
@@ -30,21 +37,23 @@ class UpdatesModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("ExpoUpdates")
 
-    Events(
-      UpdatesJSEvent.StateChange.eventName
-    )
+    Events<UpdatesJSEvent>()
 
     Constants {
       UpdatesLogger(context).info("UpdatesModule: getConstants called", UpdatesErrorCode.None)
       UpdatesController.instance.getConstantsForModule().toModuleConstantsMap()
     }
 
-    OnStartObserving {
-      UpdatesController.onEventListenerStartObserving(appContext.eventEmitter(this@UpdatesModule))
+    OnStartObserving(UpdatesJSEvent.StateChange) {
+      UpdatesController.setUpdatesEventManagerObserver(WeakReference(this@UpdatesModule))
+    }
+
+    OnStopObserving(UpdatesJSEvent.StateChange) {
+      UpdatesController.removeUpdatesEventManagerObserver()
     }
 
-    OnStopObserving {
-      UpdatesController.onEventListenerStopObserving()
+    OnDestroy {
+      UpdatesController.removeUpdatesEventManagerObserver()
     }
 
     AsyncFunction("reload") { promise: Promise ->
@@ -240,4 +249,8 @@ class UpdatesModule : Module() {
       )
     }
   }
+
+  override fun onStateMachineContextEvent(context: UpdatesStateContext) {
+    sendEvent(UpdatesJSEvent.StateChange, Bundle().apply { putBundle("context", context.bundle) })
+  }
 }

package/android/src/main/java/expo/modules/updates/errorrecovery/ErrorRecovery.kt

@@ -6,9 +6,9 @@ import com.facebook.react.bridge.DefaultJSExceptionHandler
 import com.facebook.react.bridge.ReactMarker
 import com.facebook.react.bridge.ReactMarker.MarkerListener
 import com.facebook.react.bridge.ReactMarkerConstants
-import com.facebook.react.config.ReactFeatureFlags
 import com.facebook.react.devsupport.ReleaseDevSupportManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager
+import expo.modules.rncompatibility.ReactNativeFeatureFlags
 import expo.modules.updates.logging.UpdatesErrorCode
 import expo.modules.updates.logging.UpdatesLogger
 import java.lang.ref.WeakReference
@@ -97,7 +97,7 @@ class ErrorRecovery(
   }
 
   private fun registerErrorHandler(devSupportManager: DevSupportManager) {
-    if (ReactFeatureFlags.enableBridgelessArchitecture) {
+    if (ReactNativeFeatureFlags.enableBridgelessArchitecture) {
       registerErrorHandlerImplBridgeless()
     } else {
       registerErrorHandlerImplBridge(devSupportManager)
@@ -120,7 +120,7 @@ class ErrorRecovery(
       }
     }
     val devSupportManagerClass = devSupportManager.javaClass
-    previousExceptionHandler = devSupportManagerClass.getDeclaredField("mDefaultJSExceptionHandler").let { field ->
+    previousExceptionHandler = devSupportManagerClass.getDeclaredField("defaultJSExceptionHandler").let { field ->
       field.isAccessible = true
       val previousValue = field[devSupportManager]
       field[devSupportManager] = defaultJSExceptionHandler
@@ -130,7 +130,7 @@ class ErrorRecovery(
   }
 
   private fun unregisterErrorHandler() {
-    if (ReactFeatureFlags.enableBridgelessArchitecture) {
+    if (ReactNativeFeatureFlags.enableBridgelessArchitecture) {
       unregisterErrorHandlerImplBridgeless()
     } else {
       unregisterErrorHandlerImplBridge()
@@ -152,7 +152,7 @@ class ErrorRecovery(
       }
 
       val devSupportManagerClass = devSupportManager.javaClass
-      devSupportManagerClass.getDeclaredField("mDefaultJSExceptionHandler").let { field ->
+      devSupportManagerClass.getDeclaredField("defaultJSExceptionHandler").let { field ->
         field.isAccessible = true
         field[devSupportManager] = previousExceptionHandler
       }

package/android/src/main/java/expo/modules/updates/events/IUpdatesEventManager.kt

@@ -1,13 +1,13 @@
 package expo.modules.updates.events
 
-import expo.modules.kotlin.events.EventEmitter
 import expo.modules.updates.statemachine.UpdatesStateContext
+import java.lang.ref.WeakReference
 
-enum class UpdatesJSEvent(val eventName: String) {
-  StateChange("Expo.nativeUpdatesStateChangeEvent")
+interface IUpdatesEventManagerObserver {
+  fun onStateMachineContextEvent(context: UpdatesStateContext)
 }
 
 interface IUpdatesEventManager {
-  var eventEmitter: EventEmitter?
+  var observer: WeakReference<IUpdatesEventManagerObserver>?
   fun sendStateMachineContextEvent(context: UpdatesStateContext)
 }

package/android/src/main/java/expo/modules/updates/events/NoOpUpdatesEventManager.kt

@@ -1,9 +1,9 @@
 package expo.modules.updates.events
 
-import expo.modules.kotlin.events.EventEmitter
 import expo.modules.updates.statemachine.UpdatesStateContext
+import java.lang.ref.WeakReference
 
 class NoOpUpdatesEventManager : IUpdatesEventManager {
-  override var eventEmitter: EventEmitter? = null
+  override var observer: WeakReference<IUpdatesEventManagerObserver>? = null
   override fun sendStateMachineContextEvent(context: UpdatesStateContext) {}
 }

package/android/src/main/java/expo/modules/updates/events/UpdatesEventManager.kt

@@ -1,31 +1,27 @@
 package expo.modules.updates.events
 
-import expo.modules.kotlin.events.EventEmitter
 import expo.modules.updates.logging.UpdatesErrorCode
 import expo.modules.updates.logging.UpdatesLogger
 import expo.modules.updates.statemachine.UpdatesStateContext
+import java.lang.ref.WeakReference
 
 class UpdatesEventManager(private val logger: UpdatesLogger) : IUpdatesEventManager {
-  override var eventEmitter: EventEmitter? = null
+  override var observer: WeakReference<IUpdatesEventManagerObserver>? = null
 
   override fun sendStateMachineContextEvent(context: UpdatesStateContext) {
-    val eventName = UpdatesJSEvent.StateChange.eventName
+    logger.debug("Sending state machine context to observer")
 
-    val eventEmitter = eventEmitter
-    if (eventEmitter == null) {
-      logger.info(
-        "Could not emit $eventName event; no event emitter was found.",
-        UpdatesErrorCode.JSRuntimeError
-      )
+    val observer = observer?.get() ?: run {
+      logger.debug("Unable to send state machine context to observer, no observer", UpdatesErrorCode.JSRuntimeError)
       return
     }
 
     try {
-      eventEmitter.emit(eventName, context.writableMap)
-      logger.info("Emitted event: name = $eventName")
+      observer.onStateMachineContextEvent(context)
+      logger.debug("Sent state machine context to observer")
     } catch (e: Exception) {
       logger.error(
-        "Could not emit $eventName event",
+        "Could not send state machine context to observer",
         e,
         UpdatesErrorCode.JSRuntimeError
       )

package/android/src/main/java/expo/modules/updates/loader/FileDownloader.kt

@@ -141,7 +141,7 @@ class FileDownloader(
 
     val isMultipart = responseBody.contentType()?.type == "multipart"
     if (isMultipart) {
-      parseMultipartRemoteUpdateResponse(responseBody, responseHeaderData, callback)
+      parseMultipartRemoteUpdateResponse(response, responseBody, responseHeaderData, callback)
     } else {
       val manifestResponseInfo = ResponsePartInfo(
         responseHeaderData = responseHeaderData,
@@ -174,38 +174,39 @@ class FileDownloader(
     }
   }
 
-  private fun parseMultipartRemoteUpdateResponse(responseBody: ResponseBody, responseHeaderData: ResponseHeaderData, callback: RemoteUpdateDownloadCallback) {
+  private fun parseMultipartRemoteUpdateResponse(response: Response, responseBody: ResponseBody, responseHeaderData: ResponseHeaderData, callback: RemoteUpdateDownloadCallback) {
     var manifestPartBodyAndHeaders: Pair<String, Headers>? = null
     var extensionsBody: String? = null
     var certificateChainString: String? = null
     var directivePartBodyAndHeaders: Pair<String, Headers>? = null
 
-    try {
-      MultipartReader(responseBody).use { reader ->
-        while (true) {
-          val nextPart = reader.nextPart() ?: break
-          nextPart.use { part ->
-            val headers = part.headers
-            val body = part.body
-            val contentDispositionValue = headers["content-disposition"]
-            if (contentDispositionValue != null) {
-              val contentDispositionName =
-                contentDispositionValue.parseContentDispositionNameParameter()
-              if (contentDispositionName != null) {
-                when (contentDispositionName) {
-                  "manifest" -> manifestPartBodyAndHeaders = Pair(body.readUtf8(), headers)
-                  "extensions" -> extensionsBody = body.readUtf8()
-                  "certificate_chain" -> certificateChainString = body.readUtf8()
-                  "directive" -> directivePartBodyAndHeaders = Pair(body.readUtf8(), headers)
+    val isEmpty = response.peekBody(1).bytes().isEmpty()
+    if (!isEmpty) {
+      try {
+        MultipartReader(responseBody).use { reader ->
+          while (true) {
+            val nextPart = reader.nextPart() ?: break
+            nextPart.use { part ->
+              val headers = part.headers
+              val body = part.body
+              val contentDispositionValue = headers["content-disposition"]
+              if (contentDispositionValue != null) {
+                val contentDispositionName =
+                  contentDispositionValue.parseContentDispositionNameParameter()
+                if (contentDispositionName != null) {
+                  when (contentDispositionName) {
+                    "manifest" -> manifestPartBodyAndHeaders = Pair(body.readUtf8(), headers)
+                    "extensions" -> extensionsBody = body.readUtf8()
+                    "certificate_chain" -> certificateChainString = body.readUtf8()
+                    "directive" -> directivePartBodyAndHeaders = Pair(body.readUtf8(), headers)
+                  }
                 }
               }
             }
           }
         }
-      }
-    } catch (e: Exception) {
-      // okhttp multipart reader doesn't support empty multipart bodies, but our spec does
-      if (responseBody.bytes().isNotEmpty()) {
+      } catch (e: Exception) {
+        // okhttp multipart reader doesn't support empty multipart bodies, but our spec does
         val message = "Error while reading multipart remote update response"
         logger.error(message, e, UpdatesErrorCode.UpdateFailedToLoad)
         callback.onFailure(IOException(message, e))
@@ -575,7 +576,7 @@ class FileDownloader(
 
       val update = UpdateFactory.getUpdate(preManifest, responseHeaderData, extensions, configuration)
       if (!SelectionPolicies.matchesFilters(update.updateEntity!!, responseHeaderData.manifestFilters)) {
-        callback.onFailure(Exception("Manifest filters that do not manifest content for downloaded manifest"))
+        callback.onFailure(Exception("Manifest filters do not match manifest content for downloaded manifest"))
       } else {
         callback.onSuccess(UpdateResponsePart.ManifestUpdateResponsePart(update))
       }

package/android/src/main/java/expo/modules/updates/loader/LoaderTask.kt

@@ -294,56 +294,66 @@ class LoaderTask(
   }
 
   private fun launchFallbackUpdateFromDisk(diskUpdateCallback: LaunchUpdateCallback) {
-    val database = databaseHolder.database
-    val launcher = DatabaseLauncher(context, configuration, directory, fileDownloader, selectionPolicy, logger)
-    candidateLauncher = launcher
-    val launcherCallback: LauncherCallback = object : LauncherCallback {
-      override fun onFailure(e: Exception) {
-        databaseHolder.releaseDatabase()
-        diskUpdateCallback.onFailure(e)
-      }
+    AsyncTask.execute {
+      val database = databaseHolder.database
+      val launcher =
+        DatabaseLauncher(context, configuration, directory, fileDownloader, selectionPolicy, logger)
+      candidateLauncher = launcher
+      val launcherCallback: LauncherCallback = object : LauncherCallback {
+        override fun onFailure(e: Exception) {
+          databaseHolder.releaseDatabase()
+          diskUpdateCallback.onFailure(e)
+        }
 
-      override fun onSuccess() {
-        databaseHolder.releaseDatabase()
-        diskUpdateCallback.onSuccess()
+        override fun onSuccess() {
+          databaseHolder.releaseDatabase()
+          diskUpdateCallback.onSuccess()
+        }
       }
-    }
-    if (configuration.hasEmbeddedUpdate) {
-      // if the embedded update should be launched (e.g. if it's newer than any other update we have
-      // in the database, which can happen if the app binary is updated), load it into the database
-      // so we can launch it
-      val embeddedUpdate = EmbeddedManifestUtils.getEmbeddedUpdate(context, configuration)!!.updateEntity
-      val launchableUpdate = launcher.getLaunchableUpdate(database)
-      val manifestFilters = ManifestMetadata.getManifestFilters(database, configuration)
-      if (selectionPolicy.shouldLoadNewUpdate(embeddedUpdate, launchableUpdate, manifestFilters)) {
-        EmbeddedLoader(context, configuration, logger, database, directory).start(object : LoaderCallback {
-          override fun onFailure(e: Exception) {
-            logger.error("Unexpected error copying embedded update", e, UpdatesErrorCode.Unknown)
-            launcher.launch(database, launcherCallback)
-          }
+      if (configuration.hasEmbeddedUpdate) {
+        // if the embedded update should be launched (e.g. if it's newer than any other update we have
+        // in the database, which can happen if the app binary is updated), load it into the database
+        // so we can launch it
+        val embeddedUpdate =
+          EmbeddedManifestUtils.getEmbeddedUpdate(context, configuration)!!.updateEntity
+        val launchableUpdate = launcher.getLaunchableUpdate(database)
+        val manifestFilters = ManifestMetadata.getManifestFilters(database, configuration)
+        if (selectionPolicy.shouldLoadNewUpdate(
+            embeddedUpdate,
+            launchableUpdate,
+            manifestFilters
+          )
+        ) {
+          EmbeddedLoader(context, configuration, logger, database, directory).start(object :
+            LoaderCallback {
+            override fun onFailure(e: Exception) {
+              logger.error("Unexpected error copying embedded update", e, UpdatesErrorCode.Unknown)
+              launcher.launch(database, launcherCallback)
+            }
 
-          override fun onSuccess(loaderResult: Loader.LoaderResult) {
-            launcher.launch(database, launcherCallback)
-          }
+            override fun onSuccess(loaderResult: Loader.LoaderResult) {
+              launcher.launch(database, launcherCallback)
+            }
 
-          override fun onAssetLoaded(
-            asset: AssetEntity,
-            successfulAssetCount: Int,
-            failedAssetCount: Int,
-            totalAssetCount: Int
-          ) {
-            // do nothing
-          }
+            override fun onAssetLoaded(
+              asset: AssetEntity,
+              successfulAssetCount: Int,
+              failedAssetCount: Int,
+              totalAssetCount: Int
+            ) {
+              // do nothing
+            }
 
-          override fun onUpdateResponseLoaded(updateResponse: UpdateResponse): Loader.OnUpdateResponseLoadedResult {
-            return Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = true)
-          }
-        })
+            override fun onUpdateResponseLoaded(updateResponse: UpdateResponse): Loader.OnUpdateResponseLoadedResult {
+              return Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = true)
+            }
+          })
+        } else {
+          launcher.launch(database, launcherCallback)
+        }
       } else {
         launcher.launch(database, launcherCallback)
       }
-    } else {
-      launcher.launch(database, launcherCallback)
     }
   }
 
@@ -439,33 +449,35 @@ class LoaderTask(
               object : LauncherCallback {
                 override fun onFailure(e: Exception) {
                   databaseHolder.releaseDatabase()
+                  callback.onRemoteUpdateFinished(
+                    RemoteUpdateStatus.ERROR,
+                    null,
+                    e
+                  )
                   remoteUpdateCallback.onFailure(e)
                   logger.error("Loaded new update but it failed to launch", e, UpdatesErrorCode.UpdateFailedToLoad)
                 }
 
                 override fun onSuccess() {
                   databaseHolder.releaseDatabase()
-                  val hasLaunchedSynchronized = synchronized(this@LoaderTask) {
+                  synchronized(this@LoaderTask) {
                     if (!hasLaunched) {
                       candidateLauncher = newLauncher
                       isUpToDate = true
                     }
-                    hasLaunched
                   }
-                  if (hasLaunchedSynchronized) {
-                    if (availableUpdate == null) {
-                      callback.onRemoteUpdateFinished(
-                        RemoteUpdateStatus.NO_UPDATE_AVAILABLE,
-                        null,
-                        null
-                      )
-                    } else {
-                      callback.onRemoteUpdateFinished(
-                        RemoteUpdateStatus.UPDATE_AVAILABLE,
-                        availableUpdate,
-                        null
-                      )
-                    }
+                  if (availableUpdate == null) {
+                    callback.onRemoteUpdateFinished(
+                      RemoteUpdateStatus.NO_UPDATE_AVAILABLE,
+                      null,
+                      null
+                    )
+                  } else {
+                    callback.onRemoteUpdateFinished(
+                      RemoteUpdateStatus.UPDATE_AVAILABLE,
+                      availableUpdate,
+                      null
+                    )
                   }
                   remoteUpdateCallback.onSuccess()
                 }

package/android/src/main/java/expo/modules/updates/procedures/RecreateReactContextProcedure.kt

@@ -27,7 +27,7 @@ class RecreateReactContextProcedure(
     Handler(Looper.getMainLooper()).post {
       reactApplication.restart(weakActivity?.get(), "Restart from RecreateReactContextProcedure")
     }
-    procedureContext.resetState()
+    procedureContext.resetStateAfterRestart()
     procedureContext.onComplete()
   }
 }

package/android/src/main/java/expo/modules/updates/procedures/RelaunchProcedure.kt

@@ -7,8 +7,8 @@ import android.os.Handler
 import android.os.Looper
 import com.facebook.react.ReactApplication
 import com.facebook.react.bridge.JSBundleLoader
-import com.facebook.react.config.ReactFeatureFlags
 import expo.modules.core.interfaces.ReactNativeHostHandler
+import expo.modules.rncompatibility.ReactNativeFeatureFlags
 import expo.modules.updates.UpdatesConfiguration
 import expo.modules.updates.db.DatabaseHolder
 import expo.modules.updates.db.Reaper
@@ -83,7 +83,7 @@ class RelaunchProcedure(
           if (shouldRunReaper) {
             runReaper()
           }
-          procedureContext.resetState()
+          procedureContext.resetStateAfterRestart()
           procedureContext.onComplete()
         }
       }
@@ -118,7 +118,7 @@ class RelaunchProcedure(
     reactApplication: ReactApplication,
     launchAssetFile: String
   ) {
-    if (ReactFeatureFlags.enableBridgelessArchitecture) {
+    if (ReactNativeFeatureFlags.enableBridgelessArchitecture) {
       return
     }
 

package/android/src/main/java/expo/modules/updates/procedures/RestartReactAppExtensions.kt

@@ -3,7 +3,7 @@ package expo.modules.updates.procedures
 import android.app.Activity
 import com.facebook.react.ReactApplication
 import com.facebook.react.common.LifecycleState
-import com.facebook.react.config.ReactFeatureFlags
+import expo.modules.rncompatibility.ReactNativeFeatureFlags
 
 /**
  * An extension for [ReactApplication] to restart the app
@@ -12,7 +12,7 @@ import com.facebook.react.config.ReactFeatureFlags
  * @param reason The restart reason. Only used on bridgeless mode.
  */
 internal fun ReactApplication.restart(activity: Activity?, reason: String) {
-  if (ReactFeatureFlags.enableBridgelessArchitecture) {
+  if (ReactNativeFeatureFlags.enableBridgelessArchitecture) {
     val reactHost = this.reactHost
     check(reactHost != null)
     if (reactHost.lifecycleState != LifecycleState.RESUMED && activity != null) {

package/android/src/main/java/expo/modules/updates/procedures/StartupProcedure.kt

@@ -102,6 +102,7 @@ class StartupProcedure(
       }
 
       override fun onFinishedAllLoading() {
+        procedureContext.processStateEvent(UpdatesStateEvent.EndStartup())
         procedureContext.onComplete()
       }
 
@@ -208,6 +209,7 @@ class StartupProcedure(
 
   override fun run(procedureContext: ProcedureContext) {
     this.procedureContext = procedureContext
+    procedureContext.processStateEvent(UpdatesStateEvent.StartStartup())
     initializeDatabaseHandler()
     initializeErrorRecovery()
     loaderTask.start()