expo-updates 0.18.16 → 0.18.17

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.18.17 — 2023-10-25
+
+### 🐛 Bug fixes
+
+- [Android] Simplify UpdatesUtils.parseDateString, fix UpdatesLoggingTest. ([#24951](https://github.com/expo/expo/pull/24951) by [@douglowder](https://github.com/douglowder))
+
 ## 0.18.16 — 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.16'
+version = '0.18.17'
 
 // 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.16'
+    versionName '0.18.17'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -5,7 +5,6 @@ import expo.modules.updates.UpdatesConfiguration.CheckAutomaticallyConfiguration
 import expo.modules.updates.db.entity.AssetEntity
 import android.os.AsyncTask
 import android.net.ConnectivityManager
-import android.os.Build
 import android.util.Base64
 import android.util.Log
 import com.facebook.react.ReactNativeHost
@@ -21,7 +20,6 @@ import org.json.JSONObject
 import java.io.*
 import java.lang.ClassCastException
 import java.lang.Exception
-import java.lang.IllegalArgumentException
 import java.lang.ref.WeakReference
 import java.security.DigestInputStream
 import java.security.MessageDigest
@@ -272,26 +270,21 @@ object UpdatesUtils {
 
   @Throws(ParseException::class)
   fun parseDateString(dateString: String): Date {
-    return try {
-      val formatter: DateFormat = when (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        true -> SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'X'", Locale.US)
-        false -> SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US).apply {
-          timeZone = TimeZone.getTimeZone("GMT")
-        }
+    try {
+      val formatter: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'X'", Locale.US)
+      return formatter.parse(dateString) as Date
+    } catch (e: Exception) {
+      // Don't throw on first attempt
+    }
+    // First attempt failed, try with 'Z' format string
+    try {
+      val formatter: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US).apply {
+        timeZone = TimeZone.getTimeZone("GMT")
       }
-      formatter.parse(dateString) as Date
-    } catch (e: ParseException) {
-      Log.e(TAG, "Failed to parse date string on first try: $dateString", e)
-      // some old Android versions don't support the 'X' character in SimpleDateFormat, so try without this
-      val formatter: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
-      formatter.timeZone = TimeZone.getTimeZone("GMT")
-      // throw if this fails too
-      formatter.parse(dateString) as Date
-    } catch (e: IllegalArgumentException) {
-      Log.e(TAG, "Failed to parse date string on first try: $dateString", e)
-      val formatter: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
-      formatter.timeZone = TimeZone.getTimeZone("GMT")
-      formatter.parse(dateString) as Date
+      return formatter.parse(dateString) as Date
+    } catch (e: Exception) {
+      // Throw if the second parse attempt fails
+      throw e
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.18.16",
+  "version": "0.18.17",
   "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": "19fbbb907b3439da37dbe21c372fba3226594a37"
+  "gitHead": "63bbdf029ce2847c870649449ee593c97bbe3fb3"
 }