fix: add start date for vJournal

mam-dev · Sep 11, 2024 · 156752c · 156752c
1 parent 9bd8695
commit 156752c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/cosmo-core/src/main/java/org/unitedinternet/cosmo/dav/io/DavInputContext.java b/cosmo-core/src/main/java/org/unitedinternet/cosmo/dav/io/DavInputContext.java
@@ -114,6 +114,7 @@ public Calendar getCalendar(boolean allowCalendarWithMethod) throws CosmoDavExce
 
         try {
             Calendar c = CalendarUtils.parseCalendar(getInputStream());
+            ValidationUtils.addRequired(c);
             ValidationUtils.verifyResult(c.validate(true));
 
             if (CalendarUtils.hasMultipleComponentTypes(c)) {

diff --git a/cosmo-core/src/main/java/org/unitedinternet/cosmo/util/ValidationUtils.java b/cosmo-core/src/main/java/org/unitedinternet/cosmo/util/ValidationUtils.java
@@ -1,5 +1,10 @@
 package org.unitedinternet.cosmo.util;
 
+import net.fortuna.ical4j.model.Calendar;
+import net.fortuna.ical4j.model.Component;
+import net.fortuna.ical4j.model.Date;
+import net.fortuna.ical4j.model.component.VJournal;
+import net.fortuna.ical4j.model.property.DtStart;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.ValidationResult;
 
@@ -15,4 +20,22 @@ public static void verifyResult(ValidationResult result) throws ValidationExcept
             throw new ValidationException("there are validation error in result");
         }
     }
+
+    public static void addRequired(Calendar calendar) {
+        addRequiredVjournal(calendar);
+    }
+
+    private static void addRequiredVjournal(Calendar calendar) {
+        if (calendar == null) {
+            return;
+        }
+        VJournal vJournal = calendar.getComponent(Component.VJOURNAL);
+        if (vJournal == null) {
+            return;
+        }
+        // See: https://github.com/orgs/ical4j/discussions/710
+        if (vJournal.getStartDate() == null) {
+            vJournal.getProperties().add(new DtStart(new Date(System.currentTimeMillis())));
+        }
+    }
 }