expo-updates 0.18.15 → 0.18.16

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 0.18.16 — 2023-10-05
+
+### 🐛 Bug fixes
+
+- Add missing export in checkForUpdateAsync result. (by [@douglowder](https://github.com/douglowder)) ([#24503](https://github.com/expo/expo/pull/24503) by [@douglowder](https://github.com/douglowder))
+- [Android] embedded loader should load images at all scales. ([#24549](https://github.com/expo/expo/pull/24549) by [@douglowder](https://github.com/douglowder))
+
 ## 0.18.15 — 2023-10-05
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.18.15'
+version = '0.18.16'
 
 // Utility method to derive boolean values from the environment or from Java properties,
 // and return them as strings to be used in BuildConfig fields
@@ -95,7 +95,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 31
-    versionName '0.18.15'
+    versionName '0.18.16'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -134,8 +134,18 @@ object UpdatesUtils {
       }
 
       // only rename after the hash has been verified
-      if (!tmpFile.renameTo(destination)) {
-        throw IOException("File download was successful, but failed to move from temporary to permanent location " + destination.absolutePath)
+      // Since renameTo() does not expose detailed errors, and can fail if source and destination
+      // are not on the same mount point, we do a copyTo followed by delete
+      try {
+        tmpFile.copyTo(destination)
+      } catch (e: NoSuchFileException) {
+        throw IOException("File download was successful, but temp file ${tmpFile.absolutePath} does not exist")
+      } catch (e: FileAlreadyExistsException) {
+        throw IOException("File download was successful, but file already exists at ${destination.absolutePath}")
+      } catch (e: Exception) {
+        throw IOException("File download was successful, but an exception occurred: $e")
+      } finally {
+        tmpFile.delete()
       }
 
       return hash

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

@@ -22,11 +22,6 @@ import java.util.*
  * update. The benefits of this include (a) a single code path for launching most updates and (b)
  * assets included in embedded updates and copied into the cache in this way do not need to be
  * redownloaded if included in future updates.
- *
- * However, if a visual asset is included at multiple scales in an embedded update, we don't have
- * access to and must skip copying scales that don't match the resolution of the current device. In
- * this case, we cannot fully copy the embedded update, and instead launch it from the original
- * location. We still copy the assets we can so they don't need to be redownloaded in the future.
  */
 class EmbeddedLoader internal constructor(
   private val context: Context,
@@ -37,7 +32,6 @@ class EmbeddedLoader internal constructor(
 ) : Loader(
   context, configuration, database, updatesDirectory, loaderFiles
 ) {
-  private val pixelDensity = context.resources.displayMetrics.density
 
   constructor(
     context: Context,
@@ -98,29 +92,6 @@ class EmbeddedLoader internal constructor(
     }
   }
 
-  override fun shouldSkipAsset(assetEntity: AssetEntity): Boolean {
-    return if (assetEntity.scales == null || assetEntity.scale == null) {
-      false
-    } else pickClosestScale(assetEntity.scales!!) != assetEntity.scale
-  }
-
-  // https://developer.android.com/guide/topics/resources/providing-resources.html#BestMatch
-  // If a perfect match is not available, the OS will pick the next largest scale.
-  // If only smaller scales are available, the OS will choose the largest available one.
-  private fun pickClosestScale(scales: Array<Float>): Float {
-    var closestScale = Float.MAX_VALUE
-    var largestScale = 0f
-    for (scale in scales) {
-      if (scale >= pixelDensity && scale < closestScale) {
-        closestScale = scale
-      }
-      if (scale > largestScale) {
-        largestScale = scale
-      }
-    }
-    return if (closestScale < Float.MAX_VALUE) closestScale else largestScale
-  }
-
   companion object {
     private val TAG = EmbeddedLoader::class.java.simpleName
 

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

@@ -34,7 +34,6 @@ abstract class Loader protected constructor(
   private var callback: LoaderCallback? = null
   private var assetTotal = 0
   private var erroredAssetList = mutableListOf<AssetEntity>()
-  private var skippedAssetList = mutableListOf<AssetEntity>()
   private var existingAssetList = mutableListOf<AssetEntity>()
   private var finishedAssetList = mutableListOf<AssetEntity>()
 
@@ -89,8 +88,6 @@ abstract class Loader protected constructor(
     callback: AssetDownloadCallback
   )
 
-  protected abstract fun shouldSkipAsset(assetEntity: AssetEntity): Boolean
-
   // lifecycle methods for class
   fun start(callback: LoaderCallback) {
     if (this.callback != null) {
@@ -129,7 +126,6 @@ abstract class Loader protected constructor(
     callback = null
     assetTotal = 0
     erroredAssetList = mutableListOf()
-    skippedAssetList = mutableListOf()
     existingAssetList = mutableListOf()
     finishedAssetList = mutableListOf()
   }
@@ -219,17 +215,13 @@ abstract class Loader protected constructor(
   }
 
   private enum class AssetLoadResult {
-    FINISHED, ALREADY_EXISTS, ERRORED, SKIPPED
+    FINISHED, ALREADY_EXISTS, ERRORED
   }
 
   private fun downloadAllAssets(assetList: List<AssetEntity>) {
     assetTotal = assetList.size
     for (assetEntityCur in assetList) {
       var assetEntity = assetEntityCur
-      if (shouldSkipAsset(assetEntity)) {
-        handleAssetDownloadCompleted(assetEntity, AssetLoadResult.SKIPPED)
-        continue
-      }
 
       val matchingDbEntry = database.assetDao().loadAssetWithKey(assetEntity.key)
       if (matchingDbEntry != null) {
@@ -279,7 +271,6 @@ abstract class Loader protected constructor(
       AssetLoadResult.FINISHED -> finishedAssetList.add(assetEntity)
       AssetLoadResult.ALREADY_EXISTS -> existingAssetList.add(assetEntity)
       AssetLoadResult.ERRORED -> erroredAssetList.add(assetEntity)
-      AssetLoadResult.SKIPPED -> skippedAssetList.add(assetEntity)
       else -> throw AssertionError("Missing implementation for AssetLoadResult value")
     }
 
@@ -290,7 +281,7 @@ abstract class Loader protected constructor(
       assetTotal
     )
 
-    if (finishedAssetList.size + erroredAssetList.size + existingAssetList.size + skippedAssetList.size == assetTotal) {
+    if (finishedAssetList.size + erroredAssetList.size + existingAssetList.size == assetTotal) {
       try {
         for (asset in existingAssetList) {
           val existingAssetFound = database.assetDao()
@@ -313,7 +304,7 @@ abstract class Loader protected constructor(
         database.assetDao().insertAssets(finishedAssetList, updateEntity!!)
 
         if (erroredAssetList.size == 0) {
-          database.updateDao().markUpdateFinished(updateEntity!!, skippedAssetList.size != 0)
+          database.updateDao().markUpdateFinished(updateEntity!!)
         }
       } catch (e: Exception) {
         finishWithError("Error while adding new update to database", e)

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

@@ -55,10 +55,6 @@ class RemoteLoader internal constructor(
     mFileDownloader.downloadAsset(assetEntity, updatesDirectory, configuration, context, callback)
   }
 
-  override fun shouldSkipAsset(assetEntity: AssetEntity): Boolean {
-    return false
-  }
-
   companion object {
     private val TAG = RemoteLoader::class.java.simpleName
   }

package/e2e/fixtures/project_files/.detoxrc.json

@@ -35,7 +35,7 @@
     "simulator": {
       "type": "ios.simulator",
       "device": {
-        "type": "iPhone 14"
+        "type": "iPhone 15"
       }
     },
     "emulator": {

package/e2e/setup/project.js

@@ -484,7 +484,7 @@ async function initAsync(
       CI: '1',
     },
     cwd: projectRoot,
-    stdio: 'ignore',
+    stdio: 'inherit',
   });
 
   // We are done with template tarball

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.18.15",
+  "version": "0.18.16",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -64,5 +64,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "d2b91e83b2845467865b2ec3b975edba0a5d6995"
+  "gitHead": "19fbbb907b3439da37dbe21c372fba3226594a37"
 }