Pass time zone registry to androidifyTimeZone

Author: rfc2822

lib/src/androidTest/kotlin/at/bitfire/ical4android/util/AndroidTimeUtilsTest.kt

@@ -54,7 +54,7 @@ class AndroidTimeUtilsTest {
     @Test
     fun testAndroidifyTimeZone_Null() {
         // must not throw an exception
-        AndroidTimeUtils.androidifyTimeZone(null)
+        AndroidTimeUtils.androidifyTimeZone(null, tzRegistry)
     }
 
     // androidifyTimeZone
@@ -64,7 +64,7 @@ class AndroidTimeUtilsTest {
     fun testAndroidifyTimeZone_DateProperty_Date() {
         // dates (without time) should be ignored
         val dtStart = DtStart(Date("20150101"))
-        AndroidTimeUtils.androidifyTimeZone(dtStart)
+        AndroidTimeUtils.androidifyTimeZone(dtStart, tzRegistry)
         assertTrue(DateUtils.isDate(dtStart))
         assertNull(dtStart.timeZone)
         assertFalse(dtStart.isUtc)
@@ -74,7 +74,7 @@ class AndroidTimeUtilsTest {
     fun testAndroidifyTimeZone_DateProperty_KnownTimeZone() {
         // date-time with known time zone should be unchanged
         val dtStart = DtStart("20150101T230350", tzBerlin)
-        AndroidTimeUtils.androidifyTimeZone(dtStart)
+        AndroidTimeUtils.androidifyTimeZone(dtStart, tzRegistry)
         assertEquals(tzBerlin, dtStart.timeZone)
         assertFalse(dtStart.isUtc)
     }
@@ -84,7 +84,7 @@ class AndroidTimeUtilsTest {
         // time zone that is not available on Android systems should be rewritten to system default
         val dtStart = DtStart("20150101T031000", tzCustom)
         // 20150101T031000 CustomTime [+0310] = 20150101T000000 UTC = 1420070400 UNIX
-        AndroidTimeUtils.androidifyTimeZone(dtStart)
+        AndroidTimeUtils.androidifyTimeZone(dtStart, tzRegistry)
         assertEquals(1420070400000L, dtStart.date.time)
         assertEquals(tzIdDefault, dtStart.timeZone.id)
         assertFalse(dtStart.isUtc)
@@ -94,7 +94,7 @@ class AndroidTimeUtilsTest {
     fun testAndroidifyTimeZone_DateProperty_FloatingTime() {
         // times with floating time should be treated as system default time zone
         val dtStart = DtStart("20150101T230350")
-        AndroidTimeUtils.androidifyTimeZone(dtStart)
+        AndroidTimeUtils.androidifyTimeZone(dtStart, tzRegistry)
         assertEquals(DateTime("20150101T230350", tzDefault).time, dtStart.date.time)
         assertEquals(tzIdDefault, dtStart.timeZone.id)
         assertFalse(dtStart.isUtc)
@@ -104,7 +104,7 @@ class AndroidTimeUtilsTest {
     fun testAndroidifyTimeZone_DateProperty_UTC() {
         // times with UTC should be unchanged
         val dtStart = DtStart("20150101T230350Z")
-        AndroidTimeUtils.androidifyTimeZone(dtStart)
+        AndroidTimeUtils.androidifyTimeZone(dtStart, tzRegistry)
         assertEquals(1420153430000L, dtStart.date.time)
         assertNull(dtStart.timeZone)
         assertTrue(dtStart.isUtc)

lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt

@@ -794,7 +794,8 @@ class AndroidEvent(
         val allDay = DateUtils.isDate(dtStart)
 
         // make sure that time zone is supported by Android
-        AndroidTimeUtils.androidifyTimeZone(dtStart)
+        val tzRegistry = TimeZoneRegistryFactory.getInstance().createRegistry()
+        AndroidTimeUtils.androidifyTimeZone(dtStart, tzRegistry)
 
         val recurring = event.rRules.isNotEmpty() || event.rDates.isNotEmpty()
 
@@ -830,7 +831,7 @@ class AndroidEvent(
                 .withValue(Events.EVENT_TIMEZONE, AndroidTimeUtils.storageTzId(dtStart))
 
         var dtEnd = event.dtEnd
-        AndroidTimeUtils.androidifyTimeZone(dtEnd)
+        AndroidTimeUtils.androidifyTimeZone(dtEnd, tzRegistry)
 
         var duration =
                 if (dtEnd == null)
@@ -949,7 +950,7 @@ class AndroidEvent(
                 }
             }
 
-            AndroidTimeUtils.androidifyTimeZone(dtEnd)
+            AndroidTimeUtils.androidifyTimeZone(dtEnd, tzRegistry)
             builder .withValue(Events.DTEND, dtEnd.date.time)
                     .withValue(Events.EVENT_END_TIMEZONE, AndroidTimeUtils.storageTzId(dtEnd))
                     .withValue(Events.DURATION, null)

lib/src/main/kotlin/at/bitfire/ical4android/DmfsTask.kt

@@ -539,8 +539,8 @@ abstract class DmfsTask(
             builder .withValue(Tasks.IS_ALLDAY, 1)
                     .withValue(Tasks.TZ, null)
         } else {
-            AndroidTimeUtils.androidifyTimeZone(task.dtStart)
-            AndroidTimeUtils.androidifyTimeZone(task.due)
+            AndroidTimeUtils.androidifyTimeZone(task.dtStart, tzRegistry)
+            AndroidTimeUtils.androidifyTimeZone(task.due, tzRegistry)
             builder .withValue(Tasks.IS_ALLDAY, 0)
                     .withValue(Tasks.TZ, getTimeZone().id)
         }

lib/src/main/kotlin/at/bitfire/ical4android/util/AndroidTimeUtils.kt

@@ -68,11 +68,11 @@ object AndroidTimeUtils {
      * use [storageTzId].
      *
      * @param date [DateProperty] to validate. Values which are not DATE-TIME will be ignored.
+     * @param tzRegistry    time zone registry to get time zones from
      */
-    fun androidifyTimeZone(date: DateProperty?) {
+    fun androidifyTimeZone(date: DateProperty?, tzRegistry: TimeZoneRegistry) {
         if (DateUtils.isDateTime(date) && date?.isUtc == false) {
             val tzID = DateUtils.findAndroidTimezoneID(date.timeZone?.id)
-            val tzRegistry = TimeZoneRegistryFactory.getInstance().createRegistry()
             date.timeZone = tzRegistry.getTimeZone(tzID)
         }
     }