Cleanup

Author: ArnyminerZ

lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventHandler.kt

@@ -24,37 +24,53 @@ import java.time.temporal.Temporal
 
 object EventHandler : DataRowHandler() {
 
-    // source: https://android.googlesource.com/platform/packages/apps/Contacts/+/c326c157541978c180be4e3432327eceb1e66637/src/com/android/contacts/util/CommonDateUtils.java#25
-    private val acceptableFormats: List<Pair<DateTimeFormatter, (String, DateTimeFormatter) -> Temporal>> = listOf(
-        // Formats provided by Android's CommonDateUtils
-        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX") to OffsetDateTime::parse,
-        DateTimeFormatter.ofPattern("yyyy-MM-dd") to LocalDate::parse,
-        // Additional common formats
-        DateTimeFormatter.ISO_OFFSET_DATE_TIME to OffsetDateTime::parse, // "yyyy-MM-dd'T'HH:mm:ssXXX"
+    // CommonDateUtils: https://android.googlesource.com/platform/packages/apps/Contacts/+/c326c157541978c180be4e3432327eceb1e66637/src/com/android/contacts/util/CommonDateUtils.java#25
+
+    /**
+     * Date formats for full date with time. Converts to [OffsetDateTime].
+     */
+    private val fullDateTimeFormats = listOf(
+        // Provided by Android's CommonDateUtils
+        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"),
+        // "yyyy-MM-dd'T'HH:mm:ssXXX"
+        DateTimeFormatter.ISO_OFFSET_DATE_TIME,
     )
 
+    /**
+     * Date format for full date without time. Converts to [LocalDate].
+     */
+    private val fullDateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+
+
     override fun forMimeType() = Event.CONTENT_ITEM_TYPE
 
     /**
      * Tries to parse a date string into a [Temporal] object using multiple acceptable formats.
      * Returns the parsed [Temporal] if successful, or `null` if none of the formats match.
      * @param dateString The date string to parse.
      * @return If format is:
-     * - `yyyy-MM-dd'T'HH:mm:ss.SSS'Z'` or `yyyy-MM-dd'T'HH:mm:ssXXX` -> [OffsetDateTime]
-     * - `yyyy-MM-dd` -> [LocalDate]
+     * - `yyyy-MM-dd'T'HH:mm:ss.SSS'Z'` or `yyyy-MM-dd'T'HH:mm:ssXXX` ([fullDateTimeFormats]) -> [OffsetDateTime]
+     * - `yyyy-MM-dd` ([fullDateFormat]) -> [LocalDate]
      * - else -> `null`
      */
     @VisibleForTesting
-    internal fun parseStartDate(dateString: String): Temporal? {
-        for ((formatter, parse) in acceptableFormats) {
+    internal fun parseFullDate(dateString: String): Temporal? {
+        for (formatter in fullDateTimeFormats) {
             try {
-                return parse(dateString, formatter)
+                return OffsetDateTime.parse(dateString, formatter)
             } catch (_: DateTimeParseException) {
                 // ignore: given date is not valid
                 continue
             }
         }
 
+        // try parsing as full date only (no time)
+        try {
+            return LocalDate.parse(dateString, fullDateFormat)
+        } catch (_: DateTimeParseException) {
+            // ignore: given date is not valid
+        }
+
         // could not parse date
         return null
     }
@@ -72,6 +88,8 @@ object EventHandler : DataRowHandler() {
     internal fun parsePartialDate(dateString: String): PartialDate? {
         var dateString = dateString // to allow modification
         return try {
+            // convert Android partial date/date-time to vCard partial date/date-time so that it can be parsed by ez-vcard
+
             if (dateString.endsWith('Z')) {
                 // 'Z' is not supported for suffix in PartialDate, replace with actual offset
                 dateString = dateString.removeSuffix("Z") + "+00:00"
@@ -95,7 +113,7 @@ object EventHandler : DataRowHandler() {
         super.handle(values, contact)
 
         val dateStr = values.getAsString(Event.START_DATE) ?: return
-        val full: Temporal? = parseStartDate(dateStr)
+        val full: Temporal? = parseFullDate(dateStr)
         val partial: PartialDate? = if (full == null) {
             parsePartialDate(dateStr)
         } else {

lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt

@@ -29,21 +29,40 @@ class EventHandlerTest {
     // https://android.googlesource.com/platform/packages/apps/Contacts/+/refs/tags/android-13.0.0_r49/src/com/android/contacts/util/CommonDateUtils.java
 
     @Test
-    fun test_parseStartDate_ISO_DATE_AND_TIME_FORMAT_DateTime() {
+    fun test_parseFullDate_ISO_DATE_AND_TIME_FORMAT_DateTime() {
         assertEquals(
             OffsetDateTime.of(1953, 10,  15, 23, 10, 0, 0, ZoneOffset.UTC),
-            EventHandler.parseStartDate("1953-10-15T23:10:00Z")
+            EventHandler.parseFullDate("1953-10-15T23:10:00Z")
         )
     }
 
     @Test
-    fun test_parseStartDate_FULL_DATE_FORMAT_Date() {
+    fun test_parseFullDate_FULL_DATE_FORMAT_Date() {
         assertEquals(
             LocalDate.of(1953, 10,  15),
-            EventHandler.parseStartDate("1953-10-15")
+            EventHandler.parseFullDate("1953-10-15")
         )
     }
 
+
+    @Test
+    fun test_parsePartialDate_NO_YEAR_DATE_FORMAT() {
+        assertEquals(
+            PartialDate.builder().month(10).date(15).build(),
+            EventHandler.parsePartialDate("--10-15")
+        )
+    }
+
+    @Test
+    fun test_parsePartialDate_NO_YEAR_DATE_AND_TIME_FORMAT() {
+        // Partial date does not support nanoseconds, so they will be removed
+        assertEquals(
+            PartialDate.builder().month(8).date(20).hour(23).minute(10).second(12).offset(ZoneOffset.UTC).build(),
+            EventHandler.parsePartialDate("--08-20T23:10:12.345Z")
+        )
+    }
+
+
     @Test
     fun testStartDate_Empty() {
         val contact = Contact()