fix: date parsing bug #773

Author: kieran-osgood-shopify

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

@@ -31,22 +31,27 @@
 import java.util.Locale;
 
 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 {
-        Instant instant = Instant.parse(dateTime);
-        return Date.from(instant);
-    } catch(Exception e1) {
-        // Fallback to legacy parsing in case of exception
+    private static final SimpleDateFormat Z_DATE_TIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US);
+    private static final SimpleDateFormat DATE_TIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
+
+    static Date parseDateTime(String dateTime) {
+        try {
+            return Z_DATE_TIME_FORMATTER.parse(dateTime);
+        } catch (Exception ignored) {}
+
         try {
-          return DATE_TIME_FORMATTER.parse(dateTime);
-        } catch (ParseException e2) {
-          return new Date();
+            // Fixes: https://github.com/Shopify/mobile-buy-sdk-android/issues/773
+            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() {
-  }
+    private Utils() {
+    }
 }

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

@@ -24,6 +24,13 @@
 package com.shopify.buy3
 
 import org.junit.Assert
+import org.junit.Test
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import java.util.TimeZone
+import java.util.concurrent.TimeUnit
+import kotlin.math.abs
 
 internal fun checkForIllegalArgumentException(action: () -> Unit) {
     try {
@@ -32,4 +39,27 @@ internal fun checkForIllegalArgumentException(action: () -> Unit) {
     } catch (e: IllegalArgumentException) {
         // ignore
     }
+}
+
+class UtilsTest {
+    @Test
+    fun testDateTimeParsingWithZFormat() {
+        val parsedDate = Utils.parseDateTime("2022-07-06T12:51:06Z")
+        Assert.assertEquals(
+            "Parsing returns current time instead of actual date", 
+            "Wed Jul 06 12:51:06 BST 2022",
+             parsedDate.toString()
+        )
+    }
+
+    @Test
+    fun testDateTimeParsingWithoutZFormat() {
+        val testDateStr = "2023-02-03T15:11:06"
+
+        Assert.assertEquals(
+            "Parsed date should match expected timestamp",
+            1675437066000,
+            Utils.parseDateTime(testDateStr).time
+        )
+    }
 }