expo-updates 0.13.1 → 0.13.2

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 0.13.2 — 2022-06-03
+
+### 🐛 Bug fixes
+
+- Android: Allow null asset hash in new manifests. ([#17466](https://github.com/expo/expo/pull/17466) by [@wschurman](https://github.com/wschurman))
+- Android: Fix asset hash storage. ([#17732](https://github.com/expo/expo/pull/17732) by [@wschurman](https://github.com/wschurman))
+
 ## 0.13.1 — 2022-05-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.13.1'
+version = '0.13.2'
 
 apply from: "../scripts/create-manifest-android.gradle"
 
@@ -77,7 +77,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 31
-    versionName '0.13.1'
+    versionName '0.13.2'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     // uncomment below to export the database schema when making changes

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

@@ -19,7 +19,7 @@ import java.util.*
 @Database(
   entities = [UpdateEntity::class, UpdateAssetEntity::class, AssetEntity::class, JSONDataEntity::class],
   exportSchema = false,
-  version = 10
+  version = 11
 )
 @TypeConverters(Converters::class)
 abstract class UpdatesDatabase : RoomDatabase() {
@@ -43,6 +43,7 @@ abstract class UpdatesDatabase : RoomDatabase() {
           .addMigrations(MIGRATION_7_8)
           .addMigrations(MIGRATION_8_9)
           .addMigrations(MIGRATION_9_10)
+          .addMigrations(MIGRATION_10_11)
           .fallbackToDestructiveMigration()
           .allowMainThreadQueries()
           .build()
@@ -50,6 +51,16 @@ abstract class UpdatesDatabase : RoomDatabase() {
       return instance!!
     }
 
+    private fun SupportSQLiteDatabase.runInTransaction(block: SupportSQLiteDatabase.() -> Unit) {
+      beginTransaction()
+      try {
+        block()
+        setTransactionSuccessful()
+      } finally {
+        endTransaction()
+      }
+    }
+
     private fun SupportSQLiteDatabase.runInTransactionWithForeignKeysOff(block: SupportSQLiteDatabase.() -> Unit) {
       // https://www.sqlite.org/lang_altertable.html#otheralter
       try {
@@ -150,18 +161,16 @@ abstract class UpdatesDatabase : RoomDatabase() {
 
     val MIGRATION_9_10: Migration = object : Migration(9, 10) {
       override fun migrate(database: SupportSQLiteDatabase) {
-        // https://www.sqlite.org/lang_altertable.html#otheralter
-        try {
-          database.execSQL("PRAGMA foreign_keys=OFF")
-          database.beginTransaction()
-          try {
-            database.execSQL("ALTER TABLE `assets` ADD COLUMN `expected_hash` TEXT")
-            database.setTransactionSuccessful()
-          } finally {
-            database.endTransaction()
-          }
-        } finally {
-          database.execSQL("PRAGMA foreign_keys=ON")
+        database.runInTransactionWithForeignKeysOff {
+          execSQL("ALTER TABLE `assets` ADD COLUMN `expected_hash` TEXT")
+        }
+      }
+    }
+
+    val MIGRATION_10_11: Migration = object : Migration(10, 11) {
+      override fun migrate(database: SupportSQLiteDatabase) {
+        database.runInTransaction {
+          execSQL("UPDATE `assets` SET `expected_hash` = NULL")
         }
       }
     }

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

@@ -68,7 +68,7 @@ class NewUpdateManifest private constructor(
           extraRequestHeaders = assetHeaders[mLaunchAsset.getString("key")]
           isLaunchAsset = true
           embeddedAssetFilename = EmbeddedLoader.BUNDLE_FILENAME
-          expectedHash = mLaunchAsset.getString("hash")
+          expectedHash = mLaunchAsset.getNullable("hash")
         }
       )
     } catch (e: JSONException) {
@@ -86,7 +86,7 @@ class NewUpdateManifest private constructor(
               url = Uri.parse(assetObject.getString("url"))
               extraRequestHeaders = assetHeaders[assetObject.getString("key")]
               embeddedAssetFilename = assetObject.getNullable("embeddedAssetFilename")
-              expectedHash = mLaunchAsset.getString("hash")
+              expectedHash = assetObject.getNullable("hash")
             }
           )
         } catch (e: JSONException) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.13.1",
+  "version": "0.13.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",
@@ -64,5 +64,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "b9d655c1bed682ad8919e071dd923968773f05b5"
+  "gitHead": "8c27606412dae179402107417aa11a88530c2251"
 }