Broader coverage for in/out of timezoneless time

dimagi · Oct 28, 2020 · 5abf660 · 5abf660
1 parent ab538d8
commit 5abf660
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/org/javarosa/core/model/data/TimeData.java b/src/main/java/org/javarosa/core/model/data/TimeData.java
@@ -82,7 +82,7 @@ public UncastData uncast() {
 
     @Override
     public TimeData cast(UncastData data) throws IllegalArgumentException {
-        Date ret = DateUtils.parseTime(data.value);
+        Date ret = DateUtils.parseTime(data.value, true);
         if (ret != null) {
             return new TimeData(ret);
         }

diff --git a/src/main/java/org/javarosa/core/model/utils/DateUtils.java b/src/main/java/org/javarosa/core/model/utils/DateUtils.java
@@ -509,7 +509,11 @@ private static boolean parseDateAndStore(String dateStr, DateFields df) {
     }
 
     public static Date parseTime(String str) {
-        if (timezoneOffset() != -1 && !str.contains("+") && !str.contains("-") && !str.contains("Z")) {
+        return parseTime(str, false);
+    }
+
+    public static Date parseTime(String str, boolean ignoreTimezone) {
+        if (!ignoreTimezone && (timezoneOffset() != -1 && !str.contains("+") && !str.contains("-") && !str.contains("Z"))) {
             str = str + getOffsetInStandardFormat(timezoneOffset());
         }
 

diff --git a/src/main/java/org/javarosa/xform/util/XFormAnswerDataSerializer.java b/src/main/java/org/javarosa/xform/util/XFormAnswerDataSerializer.java
@@ -105,7 +105,7 @@ public Object serializeAnswerData(DateTimeData data) {
      * formatting
      */
     public Object serializeAnswerData(TimeData data) {
-        return DateUtils.formatTime((Date)data.getValue(), DateUtils.FORMAT_ISO8601);
+        return DateUtils.formatTime((Date)data.getValue(), DateUtils.FORMAT_ISO8601_WALL_TIME);
     }
 
     /**