Reorder methods

Author: rfc2822

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

@@ -54,9 +54,39 @@ object EventHandler : DataRowHandler() {
 
     override fun forMimeType() = Event.CONTENT_ITEM_TYPE
 
+    override fun handle(values: ContentValues, contact: Contact) {
+        super.handle(values, contact)
+
+        val dateStr = values.getAsString(Event.START_DATE) ?: return
+        val full: Temporal? = parseFullDate(dateStr)
+        val partial: PartialDate? = if (full == null)
+            parsePartialDate(dateStr)
+        else
+            null
+
+        if (full != null || partial != null)
+            when (values.getAsInteger(Event.TYPE)) {
+                Event.TYPE_ANNIVERSARY ->
+                    contact.anniversary =
+                        if (full != null) Anniversary(full) else Anniversary(partial)
+
+                Event.TYPE_BIRTHDAY ->
+                    contact.birthDay = if (full != null) Birthday(full) else Birthday(partial)
+                /* Event.TYPE_OTHER,
+                Event.TYPE_CUSTOM */
+                else -> {
+                    val abDate = if (full != null) XAbDate(full) else XAbDate(partial)
+                    val label = values.getAsString(Event.LABEL).trimToNull()
+                    contact.customDates += LabeledProperty(abDate, label)
+                }
+            }
+    }
+
     /**
      * Tries to parse a contact event date string into a [Temporal] object using multiple acceptable formats.
      *
+     * "Full" means "with year" in this context.
+     *
      * @param dateString The contact event date string to parse.
      *
      * @return The parsed [Temporal] if successful, or `null` if none of the formats match. If format is:
@@ -66,6 +96,7 @@ object EventHandler : DataRowHandler() {
      */
     @VisibleForTesting
     internal fun parseFullDate(dateString: String): Temporal? {
+        // try to parse as full date-time
         for (formatter in fullDateTimeFormats) {
             try {
                 return OffsetDateTime.parse(dateString, formatter)
@@ -74,7 +105,7 @@ object EventHandler : DataRowHandler() {
             }
         }
 
-        // try parsing as full date only (no time)
+        // try to parse as full date (without time)
         try {
             return LocalDate.parse(dateString, fullDateFormat)
         } catch (_: DateTimeParseException) {
@@ -95,6 +126,8 @@ object EventHandler : DataRowHandler() {
      * Does some preprocessing to handle the 'Z' suffix and strip nanoseconds
      * (both not supported by [PartialDate.parse]).
      *
+     * "Partial" means "without year" in this context.
+     *
      * @param dateString The date string to parse.
      * @return The parsed [PartialDate] or `null` if parsing fails.
      */
@@ -111,7 +144,7 @@ object EventHandler : DataRowHandler() {
 
             // PartialDate.parse() does not accept fractions of seconds, so strip them if present
             val subSecondsRegex = "\\.\\d+".toRegex()   // 2025-12-05T010203.456+00:30
-                                                        //                  ^^^^ (number of digits may vary)
+            //                  ^^^^ (number of digits may vary)
             val subSecondsMatch = subSecondsRegex.find(withoutZ)
             val withoutSubSeconds = if (subSecondsMatch != null)
                 withoutZ.removeRange(subSecondsMatch.range)
@@ -125,32 +158,4 @@ object EventHandler : DataRowHandler() {
         }
     }
 
-    override fun handle(values: ContentValues, contact: Contact) {
-        super.handle(values, contact)
-
-        val dateStr = values.getAsString(Event.START_DATE) ?: return
-        val full: Temporal? = parseFullDate(dateStr)
-        val partial: PartialDate? = if (full == null)
-            parsePartialDate(dateStr)
-        else
-            null
-
-        if (full != null || partial != null)
-            when (values.getAsInteger(Event.TYPE)) {
-                Event.TYPE_ANNIVERSARY ->
-                    contact.anniversary =
-                        if (full != null) Anniversary(full) else Anniversary(partial)
-
-                Event.TYPE_BIRTHDAY ->
-                    contact.birthDay = if (full != null) Birthday(full) else Birthday(partial)
-                /* Event.TYPE_OTHER,
-                Event.TYPE_CUSTOM */
-                else -> {
-                    val abDate = if (full != null) XAbDate(full) else XAbDate(partial)
-                    val label = values.getAsString(Event.LABEL).trimToNull()
-                    contact.customDates += LabeledProperty(abDate, label)
-                }
-            }
-    }
-
 }