expo-updates 0.18.0 → 0.18.2

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 0.18.2 — 2023-06-23
+
+### 🐛 Bug fixes
+
+- [Android] fix instrumentation tests. ([#23037](https://github.com/expo/expo/pull/23037) by [@douglowder](https://github.com/douglowder))
+
+## 0.18.1 — 2023-06-22
+
+_This version does not introduce any user-facing changes._
+
 ## 0.18.0 — 2023-06-22
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.18.0'
+version = '0.18.2'
 
 def ex_updates_native_debug = System.getenv("EX_UPDATES_NATIVE_DEBUG") == "1" ? "true" : "false"
 
@@ -70,7 +70,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 31
-    versionName '0.18.0'
+    versionName '0.18.2'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -286,7 +286,7 @@ class UpdatesController private constructor(
         }
 
         override fun onRemoteCheckForUpdateFinished(result: LoaderTask.RemoteCheckResult) {
-          var event = UpdatesStateEvent.CheckComplete()
+          var event: UpdatesStateEvent = UpdatesStateEvent.CheckCompleteUnavailable()
           if (result.manifest != null) {
             event = UpdatesStateEvent.CheckCompleteWithUpdate(
               result.manifest
@@ -378,7 +378,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/UpdatesModule.kt

@@ -10,6 +10,7 @@ import expo.modules.core.ModuleRegistryDelegate
 import expo.modules.core.Promise
 import expo.modules.core.interfaces.ExpoMethod
 import expo.modules.updates.db.entity.AssetEntity
+import expo.modules.updates.db.entity.UpdateEntity
 import expo.modules.updates.launcher.Launcher.LauncherCallback
 import expo.modules.updates.loader.*
 import expo.modules.updates.loader.FileDownloader.RemoteUpdateDownloadCallback
@@ -23,7 +24,7 @@ import java.util.Date
 
 // these unused imports must stay because of versioning
 /* ktlint-disable no-unused-imports */
-
+import expo.modules.updates.UpdatesConfiguration
 /* ktlint-enable no-unused-imports */
 
 /**
@@ -184,7 +185,7 @@ class UpdatesModule(
                 updateInfo.putBoolean("isAvailable", false)
                 promise.resolve(updateInfo)
                 updatesServiceLocal.stateMachine?.processEvent(
-                  UpdatesStateEvent.CheckComplete()
+                  UpdatesStateEvent.CheckCompleteUnavailable()
                 )
                 return
               }
@@ -222,7 +223,7 @@ class UpdatesModule(
                 updateInfo.putBoolean("isAvailable", false)
                 promise.resolve(updateInfo)
                 updatesServiceLocal.stateMachine?.processEvent(
-                  UpdatesStateEvent.CheckComplete()
+                  UpdatesStateEvent.CheckCompleteUnavailable()
                 )
               }
             }
@@ -317,12 +318,18 @@ class UpdatesModule(
                   } else {
                     updatesServiceLocal.resetSelectionPolicy()
                     updateInfo.putBoolean("isNew", true)
+
+                    // We need the explicit casting here because when in versioned expo-updates,
+                    // the UpdateEntity and UpdatesModule are in different package namespace,
+                    // Kotlin cannot do the smart casting for that case.
+                    val updateEntity = loaderResult.updateEntity as UpdateEntity
+
                     updateInfo.putString(
                       "manifestString",
-                      loaderResult.updateEntity.manifest.toString()
+                      updateEntity.manifest.toString()
                     )
                     updatesServiceLocal.stateMachine?.processEvent(
-                      UpdatesStateEvent.DownloadCompleteWithUpdate(loaderResult.updateEntity.manifest)
+                      UpdatesStateEvent.DownloadCompleteWithUpdate(updateEntity.manifest!!)
                     )
                   }
                 }

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

@@ -105,15 +105,11 @@ class LegacyUpdateManifest private constructor(
         commitTime = Date()
       } else {
         id = UUID.fromString(manifest.getReleaseId())
-        val commitTimeString = manifest.getCommitTime()
-        commitTime = if (commitTimeString != null) {
-          try {
-            UpdatesUtils.parseDateString(commitTimeString)
-          } catch (e: ParseException) {
-            Log.e(TAG, "Could not parse commitTime", e)
-            Date()
-          }
-        } else {
+        commitTime = try {
+          val commitTimeString = manifest.getCommitTime() ?: throw JSONException("missing commitTime")
+          UpdatesUtils.parseDateString(commitTimeString)
+        } catch (e: ParseException) {
+          Log.e(TAG, "Could not parse commitTime", e)
           Date()
         }
       }

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

@@ -5,50 +5,26 @@ import org.json.JSONObject
 /**
 Structure representing an event that can be sent to the machine.
  */
-data class UpdatesStateEvent(
-  val type: UpdatesStateEventType,
-  val manifest: JSONObject? = null,
-  private val errorMessage: String? = null,
-  val isRollback: Boolean = false
-) {
-  val error: UpdatesStateError?
-    get() {
-      return errorMessage?.let { UpdatesStateError(it) }
-    }
-
-  companion object {
-    fun Check(): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.Check)
-    }
-    fun Download(): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.Download)
-    }
-    fun CheckError(message: String): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.CheckError, errorMessage = message)
-    }
-    fun DownloadError(message: String): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.DownloadError, errorMessage = message)
-    }
-    fun CheckComplete(): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.CheckCompleteUnavailable)
-    }
-    fun CheckCompleteWithUpdate(manifest: JSONObject?): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.CheckCompleteAvailable, manifest = manifest)
-    }
-    fun CheckCompleteWithRollback(): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.CheckCompleteAvailable, isRollback = true)
-    }
-    fun DownloadComplete(): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.DownloadComplete)
-    }
-    fun DownloadCompleteWithUpdate(manifest: JSONObject?): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.DownloadComplete, manifest = manifest)
-    }
-    fun DownloadCompleteWithRollback(): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.DownloadComplete, isRollback = true)
-    }
-    fun Restart(): UpdatesStateEvent {
-      return UpdatesStateEvent(UpdatesStateEventType.Restart)
-    }
+sealed class UpdatesStateEvent(val type: UpdatesStateEventType) {
+  class Check : UpdatesStateEvent(UpdatesStateEventType.Check)
+  class Download : UpdatesStateEvent(UpdatesStateEventType.Download)
+  class CheckError(private val errorMessage: String) : UpdatesStateEvent(UpdatesStateEventType.CheckError) {
+    val error: UpdatesStateError
+      get() {
+        return UpdatesStateError(errorMessage)
+      }
+  }
+  class DownloadError(private val errorMessage: String) : UpdatesStateEvent(UpdatesStateEventType.DownloadError) {
+    val error: UpdatesStateError
+      get() {
+        return UpdatesStateError(errorMessage)
+      }
   }
+  class CheckCompleteUnavailable : UpdatesStateEvent(UpdatesStateEventType.CheckCompleteUnavailable)
+  class CheckCompleteWithUpdate(val manifest: JSONObject) : UpdatesStateEvent(UpdatesStateEventType.CheckCompleteAvailable)
+  class CheckCompleteWithRollback : UpdatesStateEvent(UpdatesStateEventType.CheckCompleteAvailable)
+  class DownloadComplete : UpdatesStateEvent(UpdatesStateEventType.DownloadComplete)
+  class DownloadCompleteWithUpdate(val manifest: JSONObject) : UpdatesStateEvent(UpdatesStateEventType.DownloadComplete)
+  class DownloadCompleteWithRollback : UpdatesStateEvent(UpdatesStateEventType.DownloadComplete)
+  class Restart : UpdatesStateEvent(UpdatesStateEventType.Restart)
 }

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

@@ -9,7 +9,7 @@ import expo.modules.updates.logging.UpdatesLogger
  */
 class UpdatesStateMachine(
   androidContext: Context,
-  val changeEventSender: UpdatesStateChangeEventSender
+  private val changeEventSender: UpdatesStateChangeEventSender
 ) {
 
   private val logger = UpdatesLogger(androidContext)
@@ -32,7 +32,7 @@ class UpdatesStateMachine(
     state = UpdatesStateValue.Idle
     context = UpdatesStateContext()
     logger.info("Updates state change: reset, context = ${context.json}")
-    sendChangeEventToJS()
+    sendChangeEventToJS(UpdatesStateEvent.Restart())
   }
 
   /**
@@ -61,15 +61,9 @@ class UpdatesStateMachine(
     return true
   }
 
-  /**
-   * If a state change event is passed in, the JS sender
-   * is called with just the fields and values that changed.
-   * During a reset, this method is called with no event passed in,
-   * and then all the fields and the entire context are passed to the JS sender.
-   */
-  private fun sendChangeEventToJS(event: UpdatesStateEvent? = null) {
+  private fun sendChangeEventToJS(event: UpdatesStateEvent) {
     changeEventSender.sendUpdateStateChangeEventToBridge(
-      event?.type ?: UpdatesStateEventType.Restart,
+      event.type,
       context.copy()
     )
   }
@@ -105,43 +99,57 @@ class UpdatesStateMachine(
      * made by processing the event.
      */
     private fun reduceContext(context: UpdatesStateContext, event: UpdatesStateEvent): UpdatesStateContext {
-      return when (event.type) {
-        UpdatesStateEventType.Check -> context.copy(isChecking = true)
-        UpdatesStateEventType.CheckCompleteUnavailable -> context.copy(
+      return when (event) {
+        is UpdatesStateEvent.Check -> context.copy(isChecking = true)
+        is UpdatesStateEvent.CheckCompleteUnavailable -> context.copy(
           isChecking = false,
           checkError = null,
           latestManifest = null,
           isUpdateAvailable = false,
           isRollback = false
         )
-        UpdatesStateEventType.CheckCompleteAvailable -> context.copy(
+        is UpdatesStateEvent.CheckCompleteWithRollback -> context.copy(
+          isChecking = false,
+          checkError = null,
+          latestManifest = null,
+          isUpdateAvailable = true,
+          isRollback = true
+        )
+        is UpdatesStateEvent.CheckCompleteWithUpdate -> context.copy(
           isChecking = false,
           checkError = null,
           latestManifest = event.manifest,
           isUpdateAvailable = true,
-          isRollback = event.isRollback
+          isRollback = false
         )
-        UpdatesStateEventType.CheckError -> context.copy(
+        is UpdatesStateEvent.CheckError -> context.copy(
           isChecking = false,
           checkError = event.error
         )
-        UpdatesStateEventType.Download -> context.copy(isDownloading = true)
-        UpdatesStateEventType.DownloadComplete -> context.copy(
+        is UpdatesStateEvent.Download -> context.copy(isDownloading = true)
+        is UpdatesStateEvent.DownloadComplete -> context.copy(
           isDownloading = false,
           downloadError = null,
-          latestManifest = event.manifest ?: context.latestManifest,
-          downloadedManifest = event.manifest ?: context.downloadedManifest,
           isUpdatePending = true,
-          isUpdateAvailable = when (event.manifest) {
-            null -> context.isUpdateAvailable
-            else -> true
-          }
         )
-        UpdatesStateEventType.DownloadError -> context.copy(
+        is UpdatesStateEvent.DownloadCompleteWithRollback -> context.copy(
+          isDownloading = false,
+          downloadError = null,
+          isUpdatePending = true,
+        )
+        is UpdatesStateEvent.DownloadCompleteWithUpdate -> context.copy(
+          isDownloading = false,
+          downloadError = null,
+          latestManifest = event.manifest,
+          downloadedManifest = event.manifest,
+          isUpdatePending = true,
+          isUpdateAvailable = true
+        )
+        is UpdatesStateEvent.DownloadError -> context.copy(
           isDownloading = false,
           downloadError = event.error
         )
-        UpdatesStateEventType.Restart -> context.copy(
+        is UpdatesStateEvent.Restart -> context.copy(
           isRestarting = true
         )
       }

package/ios/EXUpdates/UpdatesModule.swift

@@ -20,6 +20,8 @@ public final class UpdatesModule: Module {
 
   public required init(appContext: AppContext) {
     updatesService = appContext.legacyModule(implementing: EXUpdatesModuleInterface.self)
+    // Ensures the universal UpdatesConfig can cast to versioned UpdatesConfig without exception in Swift
+    object_setClass(updatesService?.config, UpdatesConfig.self)
     super.init(appContext: appContext)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -65,5 +65,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "e2e2d23c044f4d0ded6d82ea7d93ff5e725c8a2e"
+  "gitHead": "a72ae33519fe54eaf195dc3e61a49db8345103db"
 }