expo-updates 0.19.1 → 0.21.0

package/CHANGELOG.md

@@ -10,6 +10,43 @@
 
 ### 💡 Others
 
+## 0.21.0 — 2023-09-15
+
+### 🎉 New features
+
+- Added support for Apple tvOS. ([#24329](https://github.com/expo/expo/pull/24329) by [@douglowder](https://github.com/douglowder))
+
+### 🐛 Bug fixes
+
+- Fix updates enabled defaulting on iOS. ([#24327](https://github.com/expo/expo/pull/24327) by [@wschurman](https://github.com/wschurman))
+- [Android] Make scopekey only required when getting database entity. ([#24466](https://github.com/expo/expo/pull/24466) by [@wschurman](https://github.com/wschurman))
+
+### 💡 Others
+
+- Update E2E test. ([#24272](https://github.com/expo/expo/pull/24272) by [@EvanBacon](https://github.com/EvanBacon))
+- [iOS] Disable packager and bundle JS when `EX_UPDATES_NATIVE_DEBUG` set. ([#24366](https://github.com/expo/expo/pull/24366) by [@douglowder](https://github.com/douglowder))
+- Add Apple TV to Updates E2E (build only). ([#24411](https://github.com/expo/expo/pull/24411) by [@douglowder](https://github.com/douglowder))
+
+## 0.20.0 — 2023-09-04
+
+### 🛠 Breaking changes
+
+- Change source of truth for constants types. ([#24049](https://github.com/expo/expo/pull/24049) by [@wschurman](https://github.com/wschurman))
+- Remove classic manifest types and classic updates. ([#24053](https://github.com/expo/expo/pull/24053), [#24066](https://github.com/expo/expo/pull/24066) by [@wschurman](https://github.com/wschurman))
+
+### 🎉 New features
+
+- Added support for React Native 0.73. ([#24018](https://github.com/expo/expo/pull/24018) by [@kudo](https://github.com/kudo))
+- Add rollback support to useUpdates(). ([#24071](https://github.com/expo/expo/pull/24071) by [@douglowder](https://github.com/douglowder))
+
+### 🐛 Bug fixes
+
+- [Android] completely fix `node` execution on Windows ([#24116](https://github.com/expo/expo/pull/24116) by [@weykon](https://github.com/weykon))
+- [Android] Fixed the `node` execution on Windows. ([#23983](https://github.com/expo/expo/pull/23983) by [@kudo](https://github.com/kudo))
+- Bare update manifest non-nullability parity. ([#23166](https://github.com/expo/expo/pull/23166) by [@wschurman](https://github.com/wschurman))
+- Support importing assets from out of the project root when working in monorepos. ([#24090](https://github.com/expo/expo/pull/24090) by [@EvanBacon](https://github.com/EvanBacon))
+- Prevent failed updates from passing checkForUpdateAsync(). ([#24112](https://github.com/expo/expo/pull/24112) by [@douglowder](https://github.com/douglowder))
+
 ## 0.19.1 — 2023-08-02
 
 ### 💡 Others

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.19.1'
+version = '0.21.0'
 
 // Utility method to derive boolean values from the environment or from Java properties,
 // and return them as strings to be used in BuildConfig fields
@@ -81,13 +81,16 @@ afterEvaluate {
 android {
   compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
-  }
+  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.majorVersion
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
   }
 
   namespace "expo.modules.updates"
@@ -95,7 +98,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 31
-    versionName '0.19.1'
+    versionName '0.21.0'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -289,7 +289,7 @@ class UpdatesController private constructor(
           val event = when (result) {
             is LoaderTask.RemoteCheckResult.NoUpdateAvailable -> UpdatesStateEvent.CheckCompleteUnavailable()
             is LoaderTask.RemoteCheckResult.UpdateAvailable -> UpdatesStateEvent.CheckCompleteWithUpdate(result.manifest)
-            is LoaderTask.RemoteCheckResult.RollBackToEmbedded -> UpdatesStateEvent.CheckCompleteWithRollback()
+            is LoaderTask.RemoteCheckResult.RollBackToEmbedded -> UpdatesStateEvent.CheckCompleteWithRollback(result.commitTime)
           }
           stateMachine.processEvent(event)
         }
@@ -375,7 +375,7 @@ class UpdatesController private constructor(
               params.putString("manifestString", update.manifest.toString())
               sendLegacyUpdateEventToJS(UPDATE_AVAILABLE_EVENT, params)
               stateMachine.processEvent(
-                UpdatesStateEvent.DownloadCompleteWithUpdate(update.manifest!!)
+                UpdatesStateEvent.DownloadCompleteWithUpdate(update.manifest)
               )
             }
             RemoteUpdateStatus.NO_UPDATE_AVAILABLE -> {

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

@@ -154,7 +154,7 @@ class UpdatesDevLauncherController : UpdatesInterface {
           controller.setLauncher(launcher)
           callback.onSuccess(object : UpdatesInterface.Update {
             override fun getManifest(): JSONObject {
-              return launcher.launchedUpdate!!.manifest!!
+              return launcher.launchedUpdate!!.manifest
             }
 
             override fun getLaunchAssetPath(): String {

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

@@ -27,7 +27,6 @@ import expo.modules.updates.manifest.UpdateManifest
 
 // these unused imports must stay because of versioning
 /* ktlint-disable no-unused-imports */
-import expo.modules.updates.UpdatesConfiguration
 
 /* ktlint-enable no-unused-imports */
 
@@ -80,8 +79,7 @@ class UpdatesModule(
         if (launchedUpdate != null) {
           constants["updateId"] = launchedUpdate.id.toString()
           constants["commitTime"] = launchedUpdate.commitTime.time
-          constants["manifestString"] =
-            if (launchedUpdate.manifest != null) launchedUpdate.manifest.toString() else "{}"
+          constants["manifestString"] = launchedUpdate.manifest.toString()
         }
         val localAssetFiles = updatesServiceLocal.localAssetFiles
         if (localAssetFiles != null) {
@@ -138,7 +136,7 @@ class UpdatesModule(
     }
   }
 
-  // Used internally by @expo/use-updates useUpdates() to get its initial state
+  // Used internally by useUpdates() to get its initial state
   @ExpoMethod
   fun getNativeStateMachineContextAsync(promise: Promise) {
     try {
@@ -200,13 +198,23 @@ class UpdatesModule(
               if (updateDirective != null) {
                 if (updateDirective is UpdateDirective.RollBackToEmbeddedUpdateDirective) {
                   if (!updatesServiceLocal.configuration.hasEmbeddedUpdate) {
-                    promise.resolveWithCheckForUpdateAsyncResult(CheckForUpdateAsyncResult.NoUpdateAvailable(), updatesServiceLocal)
+                    promise.resolveWithCheckForUpdateAsyncResult(
+                      CheckForUpdateAsyncResult.NoUpdateAvailable(
+                        LoaderTask.RemoteCheckResultNotAvailableReason.ROLLBACK_NO_EMBEDDED
+                      ),
+                      updatesServiceLocal
+                    )
                     return
                   }
 
                   val embeddedUpdate = EmbeddedManifest.get(context, updatesServiceLocal.configuration)!!.updateEntity
                   if (embeddedUpdate == null) {
-                    promise.resolveWithCheckForUpdateAsyncResult(CheckForUpdateAsyncResult.NoUpdateAvailable(), updatesServiceLocal)
+                    promise.resolveWithCheckForUpdateAsyncResult(
+                      CheckForUpdateAsyncResult.NoUpdateAvailable(
+                        LoaderTask.RemoteCheckResultNotAvailableReason.ROLLBACK_NO_EMBEDDED
+                      ),
+                      updatesServiceLocal
+                    )
                     return
                   }
 
@@ -217,17 +225,27 @@ class UpdatesModule(
                       updateResponse.responseHeaderData?.manifestFilters
                     )
                   ) {
-                    promise.resolveWithCheckForUpdateAsyncResult(CheckForUpdateAsyncResult.NoUpdateAvailable(), updatesServiceLocal)
+                    promise.resolveWithCheckForUpdateAsyncResult(
+                      CheckForUpdateAsyncResult.NoUpdateAvailable(
+                        LoaderTask.RemoteCheckResultNotAvailableReason.ROLLBACK_REJECTED_BY_SELECTION_POLICY
+                      ),
+                      updatesServiceLocal
+                    )
                     return
                   }
 
-                  promise.resolveWithCheckForUpdateAsyncResult(CheckForUpdateAsyncResult.RollBackToEmbedded(), updatesServiceLocal)
+                  promise.resolveWithCheckForUpdateAsyncResult(CheckForUpdateAsyncResult.RollBackToEmbedded(updateDirective.commitTime), updatesServiceLocal)
                   return
                 }
               }
 
               if (updateManifest == null) {
-                promise.resolveWithCheckForUpdateAsyncResult(CheckForUpdateAsyncResult.NoUpdateAvailable(), updatesServiceLocal)
+                promise.resolveWithCheckForUpdateAsyncResult(
+                  CheckForUpdateAsyncResult.NoUpdateAvailable(
+                    LoaderTask.RemoteCheckResultNotAvailableReason.NO_UPDATE_AVAILABLE_ON_SERVER
+                  ),
+                  updatesServiceLocal
+                )
                 return
               }
 
@@ -238,15 +256,43 @@ class UpdatesModule(
                 return
               }
 
+              var shouldLaunch = false
+              var failedPreviously = false
               if (updatesServiceLocal.selectionPolicy.shouldLoadNewUpdate(
                   updateManifest.updateEntity,
                   launchedUpdate,
                   updateResponse.responseHeaderData?.manifestFilters
                 )
               ) {
+                // If "update" has failed to launch previously, then
+                // "launchedUpdate" will be an earlier update, and the test above
+                // will return true (incorrectly).
+                // We check to see if the new update is already in the DB, and if so,
+                // only allow the update if it has had no launch failures.
+                shouldLaunch = true
+                updateManifest.updateEntity?.let { updateEntity ->
+                  val storedUpdateEntity = updatesServiceLocal.databaseHolder.database.updateDao().loadUpdateWithId(
+                    updateEntity.id
+                  )
+                  updatesServiceLocal.databaseHolder.releaseDatabase()
+                  storedUpdateEntity?.let { storedUpdateEntity ->
+                    shouldLaunch = storedUpdateEntity.failedLaunchCount == 0
+                    logger.info("Stored update found: ID = ${updateEntity.id}, failureCount = ${storedUpdateEntity.failedLaunchCount}")
+                    failedPreviously = !shouldLaunch
+                  }
+                }
+              }
+              if (shouldLaunch) {
                 promise.resolveWithCheckForUpdateAsyncResult(CheckForUpdateAsyncResult.UpdateAvailable(updateManifest), updatesServiceLocal)
               } else {
-                promise.resolveWithCheckForUpdateAsyncResult(CheckForUpdateAsyncResult.NoUpdateAvailable(), updatesServiceLocal)
+                val reason = when (failedPreviously) {
+                  true -> LoaderTask.RemoteCheckResultNotAvailableReason.UPDATE_PREVIOUSLY_FAILED
+                  else -> LoaderTask.RemoteCheckResultNotAvailableReason.UPDATE_REJECTED_BY_SELECTION_POLICY
+                }
+                promise.resolveWithCheckForUpdateAsyncResult(
+                  CheckForUpdateAsyncResult.NoUpdateAvailable(reason),
+                  updatesServiceLocal
+                )
               }
             }
           }
@@ -267,9 +313,9 @@ class UpdatesModule(
       ROLL_BACK_TO_EMBEDDED
     }
 
-    class NoUpdateAvailable : CheckForUpdateAsyncResult(Status.NO_UPDATE_AVAILABLE)
+    class NoUpdateAvailable(val reason: LoaderTask.RemoteCheckResultNotAvailableReason) : CheckForUpdateAsyncResult(Status.NO_UPDATE_AVAILABLE)
     class UpdateAvailable(val updateManifest: UpdateManifest) : CheckForUpdateAsyncResult(Status.UPDATE_AVAILABLE)
-    class RollBackToEmbedded : CheckForUpdateAsyncResult(Status.ROLL_BACK_TO_EMBEDDED)
+    class RollBackToEmbedded(val commitTime: Date) : CheckForUpdateAsyncResult(Status.ROLL_BACK_TO_EMBEDDED)
   }
 
   private fun Promise.resolveWithCheckForUpdateAsyncResult(checkForUpdateAsyncResult: CheckForUpdateAsyncResult, updatesServiceLocal: UpdatesInterface) {
@@ -279,6 +325,7 @@ class UpdatesModule(
           is CheckForUpdateAsyncResult.NoUpdateAvailable -> {
             putBoolean("isRollBackToEmbedded", false)
             putBoolean("isAvailable", false)
+            putString("reason", checkForUpdateAsyncResult.reason.value)
           }
 
           is CheckForUpdateAsyncResult.RollBackToEmbedded -> {
@@ -297,7 +344,7 @@ class UpdatesModule(
     updatesServiceLocal.stateMachine?.processEvent(
       when (checkForUpdateAsyncResult) {
         is CheckForUpdateAsyncResult.NoUpdateAvailable -> UpdatesStateEvent.CheckCompleteUnavailable()
-        is CheckForUpdateAsyncResult.RollBackToEmbedded -> UpdatesStateEvent.CheckCompleteWithRollback()
+        is CheckForUpdateAsyncResult.RollBackToEmbedded -> UpdatesStateEvent.CheckCompleteWithRollback(checkForUpdateAsyncResult.commitTime)
         is CheckForUpdateAsyncResult.UpdateAvailable -> UpdatesStateEvent.CheckCompleteWithUpdate(
           checkForUpdateAsyncResult.updateManifest.manifest.getRawJson()
         )
@@ -418,7 +465,7 @@ class UpdatesModule(
                         }
                       )
                       updatesServiceLocal.stateMachine?.processEvent(
-                        UpdatesStateEvent.DownloadCompleteWithUpdate(updateEntity.manifest!!)
+                        UpdatesStateEvent.DownloadCompleteWithUpdate(updateEntity.manifest)
                       )
                     }
                   }

package/android/src/main/java/expo/modules/updates/db/UpdatesDatabase.kt

@@ -44,7 +44,7 @@ import java.util.*
 @Database(
   entities = [UpdateEntity::class, UpdateAssetEntity::class, AssetEntity::class, JSONDataEntity::class],
   exportSchema = false,
-  version = 11
+  version = 12
 )
 @TypeConverters(Converters::class)
 abstract class UpdatesDatabase : RoomDatabase() {
@@ -69,6 +69,7 @@ abstract class UpdatesDatabase : RoomDatabase() {
           .addMigrations(MIGRATION_8_9)
           .addMigrations(MIGRATION_9_10)
           .addMigrations(MIGRATION_10_11)
+          .addMigrations(MIGRATION_11_12)
           .fallbackToDestructiveMigration()
           .allowMainThreadQueries()
           .build()
@@ -199,5 +200,25 @@ abstract class UpdatesDatabase : RoomDatabase() {
         }
       }
     }
+
+    /**
+     * Change the `updates.manifest` column to be non-null
+     */
+    val MIGRATION_11_12: Migration = object : Migration(11, 12) {
+      override fun migrate(database: SupportSQLiteDatabase) {
+        database.runInTransactionWithForeignKeysOff {
+          execSQL("CREATE TABLE `new_updates` (`id` BLOB NOT NULL, `scope_key` TEXT NOT NULL, `commit_time` INTEGER NOT NULL, `runtime_version` TEXT NOT NULL, `launch_asset_id` INTEGER, `manifest` TEXT NOT NULL, `status` INTEGER NOT NULL, `keep` INTEGER NOT NULL, `last_accessed` INTEGER NOT NULL, `successful_launch_count` INTEGER NOT NULL DEFAULT 0, `failed_launch_count` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`), FOREIGN KEY(`launch_asset_id`) REFERENCES `assets`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+
+          execSQL(
+            "INSERT INTO `new_updates` (`id`, `scope_key`, `commit_time`, `runtime_version`, `launch_asset_id`, `manifest`, `status`, `keep`, `last_accessed`, `successful_launch_count`, `failed_launch_count`)" +
+              " SELECT `id`, `scope_key`, `commit_time`, `runtime_version`, `launch_asset_id`, `manifest`, `status`, `keep`, `last_accessed`, `successful_launch_count`, `failed_launch_count` FROM `updates` WHERE `manifest` IS NOT NULL"
+          )
+          execSQL("DROP TABLE `updates`")
+          execSQL("ALTER TABLE `new_updates` RENAME TO `updates`")
+          execSQL("CREATE INDEX `index_updates_launch_asset_id` ON `updates` (`launch_asset_id`)")
+          execSQL("CREATE UNIQUE INDEX `index_updates_scope_key_commit_time` ON `updates` (`scope_key`, `commit_time`)")
+        }
+      }
+    }
   }
 }

package/android/src/main/java/expo/modules/updates/db/entity/UpdateEntity.kt

@@ -36,14 +36,12 @@ class UpdateEntity(
   @field:ColumnInfo(typeAffinity = ColumnInfo.BLOB) @field:PrimaryKey var id: UUID,
   @field:ColumnInfo(name = "commit_time") var commitTime: Date,
   @field:ColumnInfo(name = "runtime_version") var runtimeVersion: String,
-  @field:ColumnInfo(name = "scope_key") var scopeKey: String
+  @field:ColumnInfo(name = "scope_key") var scopeKey: String,
+  @field:ColumnInfo(name = "manifest") var manifest: JSONObject,
 ) {
   @ColumnInfo(name = "launch_asset_id")
   var launchAssetId: Long? = null
 
-  @ColumnInfo(name = "manifest")
-  var manifest: JSONObject? = null
-
   var status = UpdateStatus.PENDING
 
   var keep = false

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

@@ -21,6 +21,7 @@ import expo.modules.updates.manifest.UpdateManifest
 import expo.modules.updates.selectionpolicy.SelectionPolicy
 import org.json.JSONObject
 import java.io.File
+import java.util.Date
 
 /**
  * Controlling class that handles the complex logic that needs to happen each time the app is cold
@@ -53,6 +54,32 @@ class LoaderTask(
     ERROR, NO_UPDATE_AVAILABLE, UPDATE_AVAILABLE
   }
 
+  enum class RemoteCheckResultNotAvailableReason(val value: String) {
+    /**
+     * No update manifest or rollback directive received from the update server.
+     */
+    NO_UPDATE_AVAILABLE_ON_SERVER("noUpdateAvailableOnServer"),
+    /**
+     * An update manifest was received from the update server, but the update is not launchable,
+     * or does not pass the configured selection policy.
+     */
+    UPDATE_REJECTED_BY_SELECTION_POLICY("updateRejectedBySelectionPolicy"),
+    /**
+     * An update manifest was received from the update server, but the update has been previously
+     * launched on this device and never successfully launched.
+     */
+    UPDATE_PREVIOUSLY_FAILED("updatePreviouslyFailed"),
+    /**
+     * A rollback directive was received from the update server, but the directive does not pass
+     * the configured selection policy.
+     */
+    ROLLBACK_REJECTED_BY_SELECTION_POLICY("rollbackRejectedBySelectionPolicy"),
+    /**
+     * A rollback directive was received from the update server, but this app has no embedded update.
+     */
+    ROLLBACK_NO_EMBEDDED("rollbackNoEmbeddedConfiguration"),
+  }
+
   sealed class RemoteCheckResult(private val status: Status) {
     private enum class Status {
       NO_UPDATE_AVAILABLE,
@@ -60,9 +87,9 @@ class LoaderTask(
       ROLL_BACK_TO_EMBEDDED
     }
 
-    class NoUpdateAvailable : RemoteCheckResult(Status.NO_UPDATE_AVAILABLE)
+    class NoUpdateAvailable(val reason: RemoteCheckResultNotAvailableReason) : RemoteCheckResult(Status.NO_UPDATE_AVAILABLE)
     class UpdateAvailable(val manifest: JSONObject) : RemoteCheckResult(Status.UPDATE_AVAILABLE)
-    class RollBackToEmbedded : RemoteCheckResult(Status.ROLL_BACK_TO_EMBEDDED)
+    class RollBackToEmbedded(val commitTime: Date) : RemoteCheckResult(Status.ROLL_BACK_TO_EMBEDDED)
   }
 
   interface LoaderTaskCallback {
@@ -335,12 +362,12 @@ class LoaderTask(
               return when (updateDirective) {
                 is UpdateDirective.RollBackToEmbeddedUpdateDirective -> {
                   isUpToDate = true
-                  callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.RollBackToEmbedded())
+                  callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.RollBackToEmbedded(updateDirective.commitTime))
                   Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = false)
                 }
                 is UpdateDirective.NoUpdateAvailableUpdateDirective -> {
                   isUpToDate = true
-                  callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.NoUpdateAvailable())
+                  callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.NoUpdateAvailable(RemoteCheckResultNotAvailableReason.NO_UPDATE_AVAILABLE_ON_SERVER))
                   Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = false)
                 }
               }
@@ -349,7 +376,7 @@ class LoaderTask(
             val updateManifest = updateResponse.manifestUpdateResponsePart?.updateManifest
             if (updateManifest == null) {
               isUpToDate = true
-              callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.NoUpdateAvailable())
+              callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.NoUpdateAvailable(RemoteCheckResultNotAvailableReason.NO_UPDATE_AVAILABLE_ON_SERVER))
               return Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = false)
             }
 
@@ -366,7 +393,11 @@ class LoaderTask(
               Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = true)
             } else {
               isUpToDate = true
-              callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.NoUpdateAvailable())
+              callback.onRemoteCheckForUpdateFinished(
+                RemoteCheckResult.NoUpdateAvailable(
+                  RemoteCheckResultNotAvailableReason.UPDATE_REJECTED_BY_SELECTION_POLICY
+                )
+              )
               Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = false)
             }
           }

package/android/src/main/java/expo/modules/updates/manifest/BareUpdateManifest.kt

@@ -22,13 +22,13 @@ import java.util.*
 class BareUpdateManifest private constructor(
   override val manifest: BareManifest,
   private val mId: UUID,
-  private val mScopeKey: String,
+  private val mScopeKey: String?,
   private val mCommitTime: Date,
   private val mRuntimeVersion: String,
   private val mAssets: JSONArray?
 ) : UpdateManifest {
   override val updateEntity: UpdateEntity by lazy {
-    UpdateEntity(mId, mCommitTime, mRuntimeVersion, mScopeKey).apply {
+    UpdateEntity(mId, mCommitTime, mRuntimeVersion, mScopeKey!!, this@BareUpdateManifest.manifest.getRawJson()).apply {
       status = UpdateStatus.EMBEDDED
     }
   }
@@ -94,7 +94,7 @@ class BareUpdateManifest private constructor(
       return BareUpdateManifest(
         manifest,
         id,
-        configuration.scopeKey!!,
+        configuration.scopeKey,
         commitTime,
         runtimeVersion,
         assets

package/android/src/main/java/expo/modules/updates/manifest/LegacyUpdateManifest.kt

@@ -34,8 +34,7 @@ class LegacyUpdateManifest private constructor(
   private val mAssets: JSONArray?
 ) : UpdateManifest {
   override val updateEntity: UpdateEntity by lazy {
-    UpdateEntity(mId, mCommitTime, mRuntimeVersion, mScopeKey).apply {
-      manifest = this@LegacyUpdateManifest.manifest.getRawJson()
+    UpdateEntity(mId, mCommitTime, mRuntimeVersion, mScopeKey, this@LegacyUpdateManifest.manifest.getRawJson()).apply {
       if (isDevelopmentMode) {
         status = UpdateStatus.DEVELOPMENT
       }

package/android/src/main/java/expo/modules/updates/manifest/NewUpdateManifest.kt

@@ -31,9 +31,7 @@ class NewUpdateManifest private constructor(
   private val mExtensions: JSONObject?
 ) : UpdateManifest {
   override val updateEntity: UpdateEntity by lazy {
-    UpdateEntity(mId, mCommitTime, mRuntimeVersion, mScopeKey).apply {
-      manifest = this@NewUpdateManifest.manifest.getRawJson()
-    }
+    UpdateEntity(mId, mCommitTime, mRuntimeVersion, mScopeKey, this@NewUpdateManifest.manifest.getRawJson())
   }
 
   private val assetHeaders: Map<String, JSONObject> by lazy {

package/android/src/main/java/expo/modules/updates/selectionpolicy/SelectionPolicies.kt

@@ -13,13 +13,12 @@ object SelectionPolicies {
   val TAG = SelectionPolicies::class.java.simpleName
 
   fun matchesFilters(update: UpdateEntity, manifestFilters: JSONObject?): Boolean {
-    val rawManifest = update.manifest
-    if (manifestFilters == null || rawManifest == null) {
+    if (manifestFilters == null) {
       // empty matches all
       return true
     }
 
-    val manifest = Manifest.fromManifestJson(rawManifest)
+    val manifest = Manifest.fromManifestJson(update.manifest)
     val metadata = manifest.getMetadata() ?: return true // empty matches all
 
     try {

package/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateContext.kt

@@ -14,12 +14,12 @@ The state machine context, with information intended to be consumed by applicati
 data class UpdatesStateContext(
   val isUpdateAvailable: Boolean = false,
   val isUpdatePending: Boolean = false,
-  val isRollback: Boolean = false,
   val isChecking: Boolean = false,
   val isDownloading: Boolean = false,
   val isRestarting: Boolean = false,
   val latestManifest: JSONObject? = null,
   val downloadedManifest: JSONObject? = null,
+  val rollback: UpdatesStateContextRollback? = null,
   val checkError: UpdatesStateError? = null,
   val downloadError: UpdatesStateError? = null,
   val lastCheckForUpdateTime: Date? = null,
@@ -30,7 +30,6 @@ data class UpdatesStateContext(
       val map: MutableMap<String, Any> = mutableMapOf(
         "isUpdateAvailable" to isUpdateAvailable,
         "isUpdatePending" to isUpdatePending,
-        "isRollback" to isRollback,
         "isChecking" to isChecking,
         "isDownloading" to isDownloading,
         "isRestarting" to isRestarting
@@ -41,6 +40,9 @@ data class UpdatesStateContext(
       if (downloadedManifest != null) {
         map["downloadedManifest"] = downloadedManifest
       }
+      if (rollback != null) {
+        map["rollback"] = rollback.json
+      }
       if (checkError != null) {
         map["checkError"] = checkError.json
       }
@@ -71,7 +73,6 @@ data class UpdatesStateContext(
       return Bundle().apply {
         putBoolean("isUpdateAvailable", isUpdateAvailable)
         putBoolean("isUpdatePending", isUpdatePending)
-        putBoolean("isRollback", isRollback)
         putBoolean("isChecking", isChecking)
         putBoolean("isDownloading", isDownloading)
         putBoolean("isRestarting", isRestarting)
@@ -81,6 +82,14 @@ data class UpdatesStateContext(
         if (downloadedManifest != null) {
           putString("downloadedManifestString", downloadedManifest.toString())
         }
+        if (rollback != null) {
+          putBundle(
+            "rollback",
+            Bundle().apply {
+              putString("commitTime", rollback.commitTimeString)
+            }
+          )
+        }
         if (checkError != null) {
           val errorMap = Bundle().apply {
             putString("message", checkError.message)

package/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateContextRollback.kt

@@ -0,0 +1,14 @@
+package expo.modules.updates.statemachine
+
+import java.util.Date
+
+data class UpdatesStateContextRollback(
+  val commitTime: Date
+) {
+
+  val commitTimeString: String
+    get() = UpdatesStateContext.DATE_FORMATTER.format(commitTime)
+
+  val json: Map<String, Any>
+    get() = mapOf("commitTime" to commitTimeString)
+}

package/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateEvent.kt

@@ -1,6 +1,7 @@
 package expo.modules.updates.statemachine
 
 import org.json.JSONObject
+import java.util.Date
 
 /**
 Structure representing an event that can be sent to the machine.
@@ -20,9 +21,9 @@ sealed class UpdatesStateEvent(val type: UpdatesStateEventType) {
         return UpdatesStateError(errorMessage)
       }
   }
-  class CheckCompleteUnavailable : UpdatesStateEvent(UpdatesStateEventType.CheckCompleteUnavailable)
+  class CheckCompleteUnavailable() : UpdatesStateEvent(UpdatesStateEventType.CheckCompleteUnavailable)
   class CheckCompleteWithUpdate(val manifest: JSONObject) : UpdatesStateEvent(UpdatesStateEventType.CheckCompleteAvailable)
-  class CheckCompleteWithRollback : UpdatesStateEvent(UpdatesStateEventType.CheckCompleteAvailable)
+  class CheckCompleteWithRollback(val commitTime: Date) : UpdatesStateEvent(UpdatesStateEventType.CheckCompleteAvailable)
   class DownloadComplete : UpdatesStateEvent(UpdatesStateEventType.DownloadComplete)
   class DownloadCompleteWithUpdate(val manifest: JSONObject) : UpdatesStateEvent(UpdatesStateEventType.DownloadComplete)
   class DownloadCompleteWithRollback : UpdatesStateEvent(UpdatesStateEventType.DownloadComplete)

package/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateMachine.kt

@@ -106,24 +106,24 @@ class UpdatesStateMachine(
           isChecking = false,
           checkError = null,
           latestManifest = null,
+          rollback = null,
           isUpdateAvailable = false,
-          isRollback = false,
           lastCheckForUpdateTime = Date(),
         )
         is UpdatesStateEvent.CheckCompleteWithRollback -> context.copy(
           isChecking = false,
           checkError = null,
           latestManifest = null,
+          rollback = UpdatesStateContextRollback(event.commitTime),
           isUpdateAvailable = true,
-          isRollback = true,
           lastCheckForUpdateTime = Date()
         )
         is UpdatesStateEvent.CheckCompleteWithUpdate -> context.copy(
           isChecking = false,
           checkError = null,
           latestManifest = event.manifest,
+          rollback = null,
           isUpdateAvailable = true,
-          isRollback = false,
           lastCheckForUpdateTime = Date()
         )
         is UpdatesStateEvent.CheckError -> context.copy(
@@ -140,13 +140,14 @@ class UpdatesStateMachine(
         is UpdatesStateEvent.DownloadCompleteWithRollback -> context.copy(
           isDownloading = false,
           downloadError = null,
-          isUpdatePending = true,
+          isUpdatePending = true
         )
         is UpdatesStateEvent.DownloadCompleteWithUpdate -> context.copy(
           isDownloading = false,
           downloadError = null,
           latestManifest = event.manifest,
           downloadedManifest = event.manifest,
+          rollback = null,
           isUpdatePending = true,
           isUpdateAvailable = true
         )