Merge pull request #781 from Shopify/kieran-osgood/fix/#773-dates

Kieran osgood/fix/#773 dates

Author: kieran-osgood-shopify

MobileBuy/buy3/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     `maven-publish`
 }
 
-version = "2025.4.0"
+version = "2025.4.1"
 
 android {
     namespace = "com.shopify.buy3"

MobileBuy/buy3/src/main/java/com/shopify/buy3/Utils.java

@@ -26,20 +26,35 @@
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.util.Date;
 import java.util.Locale;
+import java.util.TimeZone;
 
 final class Utils {
-  private static final SimpleDateFormat DATE_TIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US);
-
-  static Date parseDateTime(String dateTime) {
-      try {
-          return DATE_TIME_FORMATTER.parse(dateTime);
-      } catch (ParseException e) {
-          return new Date();
-      }
-  }
-
-  private Utils() {
-  }
+    private static final SimpleDateFormat Z_DATE_TIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+    private static final SimpleDateFormat DATE_TIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
+    private static final TimeZone timeZone = TimeZone.getTimeZone("UTC");
+
+    static Date parseDateTime(String dateTime) {
+        DATE_TIME_FORMATTER.setTimeZone(timeZone);
+        Z_DATE_TIME_FORMATTER.setTimeZone(timeZone);
+
+        try {
+            return Z_DATE_TIME_FORMATTER.parse(dateTime);
+        } catch (Exception ignored) { }
+
+        try {
+            return DATE_TIME_FORMATTER.parse(dateTime);
+        } catch (ParseException ignored) { }
+
+        try {
+            return DATE_TIME_FORMATTER.parse(new Date().toString());
+        } catch (ParseException e) {
+            return new Date();
+        }
+    }
+
+    private Utils() {
+    }
 }

MobileBuy/buy3/src/test/java/com/shopify/buy3/Utils.kt

@@ -24,6 +24,8 @@
 package com.shopify.buy3
 
 import org.junit.Assert
+import org.junit.Test
+import java.time.ZoneOffset
 
 internal fun checkForIllegalArgumentException(action: () -> Unit) {
     try {
@@ -32,4 +34,28 @@ internal fun checkForIllegalArgumentException(action: () -> Unit) {
     } catch (e: IllegalArgumentException) {
         // ignore
     }
+}
+
+class UtilsTest {
+    @Test
+    fun testDateTimeParsingFormat() {
+        val dateTimeStr = "2023-02-03T15:11:06"
+
+        Assert.assertEquals(
+            "Parsed date should match expected timestamp",
+            "2023-02-03T15:11:06Z",
+            Utils.parseDateTime(dateTimeStr).toInstant().atZone(ZoneOffset.UTC).toString()
+        )
+    }
+
+    @Test
+    fun test_Z_DateTimeParsingFormat() {
+        val dateTimeStr = "2022-07-06T00:51:06Z"
+        val dateTime = Utils.parseDateTime(dateTimeStr)
+        Assert.assertEquals(
+            "Parsing returns current time instead of actual date",
+            dateTimeStr,
+            dateTime.toInstant().atZone(ZoneOffset.UTC).toString()
+        )
+    }
 }