Move getLegacyEvent to LegacyAndroidCalendar

Author: rfc2822

lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidEventTest.kt

@@ -96,7 +96,7 @@ class AndroidEventTest {
         val uri = legacyCalendar.add(event)
 
         // update test event in calendar
-        val testEvent = calendar.getLegacyEvent(ContentUris.parseId(uri))!!
+        val testEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri))!!
         val event2 = legacyCalendar.getEvent(testEvent.id)!!
         event2.summary = "Updated event"
         // add data rows
@@ -108,7 +108,7 @@ class AndroidEventTest {
         assertEquals(ContentUris.parseId(uri), ContentUris.parseId(uri2))
 
         // read again and verify result
-        val updatedEvent = calendar.getLegacyEvent(ContentUris.parseId(uri2))!!
+        val updatedEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri2))!!
         try {
             val event3 = legacyCalendar.getEvent(updatedEvent.id)!!
             assertEquals(event2.summary, event3.summary)
@@ -131,15 +131,15 @@ class AndroidEventTest {
         val id = ContentUris.parseId(uri)
 
         // verify that it has color
-        val beforeUpdate = calendar.getLegacyEvent(id)!!
+        val beforeUpdate = legacyCalendar.getAndroidEvent(calendar, id)!!
         assertNotNull(legacyCalendar.getEvent(beforeUpdate.id)!!.color)
 
         // update: reset color
         event.color = null
         beforeUpdate.update(event)
 
         // verify that it doesn't have color anymore
-        val afterUpdate = calendar.getLegacyEvent(id)!!
+        val afterUpdate = legacyCalendar.getAndroidEvent(calendar, id)!!
         assertNull(legacyCalendar.getEvent(afterUpdate.id)!!.color)
     }
 
@@ -153,7 +153,7 @@ class AndroidEventTest {
         val uri = legacyCalendar.add(event)
 
         // update test event in calendar
-        val testEvent = calendar.getLegacyEvent(ContentUris.parseId(uri))!!
+        val testEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri))!!
         val event2 = legacyCalendar.getEvent(testEvent.id)!!
         event2.summary = "Sample event without STATUS"
         event2.status = Status.VEVENT_CONFIRMED
@@ -163,7 +163,7 @@ class AndroidEventTest {
         assertEquals(ContentUris.parseId(uri), ContentUris.parseId(uri2))
 
         // read again and verify result
-        val updatedEvent = calendar.getLegacyEvent(ContentUris.parseId(uri2))!!
+        val updatedEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri2))!!
         try {
             val event3 = legacyCalendar.getEvent(updatedEvent.id)!!
             assertEquals(Status.VEVENT_CONFIRMED, event3.status)
@@ -183,7 +183,7 @@ class AndroidEventTest {
         val uri = legacyCalendar.add(event)
 
         // update test event in calendar
-        val testEvent = calendar.getLegacyEvent(ContentUris.parseId(uri))!!
+        val testEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri))!!
         val event2 = legacyCalendar.getEvent(testEvent.id)!!
         event2.summary = "Sample event without STATUS"
         event2.status = null
@@ -193,7 +193,7 @@ class AndroidEventTest {
         assertNotEquals(ContentUris.parseId(uri), ContentUris.parseId(uri2))
 
         // read again and verify result
-        val updatedEvent = calendar.getLegacyEvent(ContentUris.parseId(uri2))!!
+        val updatedEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri2))!!
         try {
             val event3 = legacyCalendar.getEvent(updatedEvent.id)!!
             assertNull(event3.status)
@@ -214,7 +214,7 @@ class AndroidEventTest {
             event.attendees += Attendee(URI("mailto:att$i@example.com"))
         val uri = legacyCalendar.add(event)
 
-        val testEvent = calendar.getLegacyEvent(ContentUris.parseId(uri))!!
+        val testEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri))!!
         try {
             assertEquals(20, legacyCalendar.getEvent(testEvent.id)!!.attendees.size)
         } finally {

lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/calendar/LegacyAndroidEventProcessorTest.kt

@@ -10,11 +10,9 @@ import android.accounts.Account
 import android.content.ContentProviderClient
 import android.content.ContentUris
 import android.content.ContentValues
-import android.net.Uri
 import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
 import android.provider.CalendarContract.AUTHORITY
 import android.provider.CalendarContract.Attendees
-import android.provider.CalendarContract.Calendars
 import android.provider.CalendarContract.Events
 import android.provider.CalendarContract.ExtendedProperties
 import android.provider.CalendarContract.Reminders
@@ -77,8 +75,8 @@ class LegacyAndroidEventProcessorTest {
     private val tzVienna = tzRegistry.getTimeZone("Europe/Vienna")!!
     private val tzShanghai = tzRegistry.getTimeZone("Asia/Shanghai")!!
 
-    private lateinit var calendarUri: Uri
     private lateinit var calendar: AndroidCalendar
+    lateinit var legacyCalendar: LegacyAndroidCalendar
     lateinit var client: ContentProviderClient
 
     @Before
@@ -87,7 +85,7 @@ class LegacyAndroidEventProcessorTest {
         client = context.contentResolver.acquireContentProviderClient(AUTHORITY)!!
 
         calendar = TestCalendar.findOrCreate(testAccount, client)
-        calendarUri = ContentUris.withAppendedId(Calendars.CONTENT_URI, calendar.id)
+        legacyCalendar = LegacyAndroidCalendar(calendar)
     }
 
     @After
@@ -135,7 +133,7 @@ class LegacyAndroidEventProcessorTest {
             client.insert(ExtendedProperties.CONTENT_URI.asSyncAdapter(testAccount), extendedValues)
         }
 
-        return destinationCalendar.getLegacyEvent(id)!!
+        return legacyCalendar.getAndroidEvent(destinationCalendar, id)!!
     }
 
     private fun populateEvent(

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

@@ -17,6 +17,7 @@ import at.bitfire.synctools.storage.calendar.CalendarBatchOperation
 /**
  * Provides legacy features (read/write of legacy [Event]s), based on the new [AndroidCalendar].
  */
+@Deprecated("Use AndroidCalendar instead")
 class LegacyAndroidCalendar(
     private val calendar: AndroidCalendar
 ) {
@@ -49,6 +50,17 @@ class LegacyAndroidCalendar(
         return resultUri
     }
 
+    /**
+     * Gets a specific legacy [AndroidEvent], identified by the event ID, from this calendar.
+     *
+     * @param id    event ID
+     * @return event (or `null` if not found)
+     */
+    fun getAndroidEvent(androidCalendar: AndroidCalendar, id: Long): AndroidEvent? {
+        val values = androidCalendar.getEventValues(id, null) ?: return null
+        return AndroidEvent(androidCalendar, values)
+    }
+
     /**
      * Gets an [Event] data object from an Android event with a specific ID.
      *

lib/src/main/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendar.kt

@@ -17,8 +17,6 @@ import android.provider.CalendarContract.Events
 import android.provider.CalendarContract.EventsEntity
 import android.provider.CalendarContract.ExtendedProperties
 import android.provider.CalendarContract.Reminders
-
-
 import at.bitfire.ical4android.UnknownProperty
 import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
 import at.bitfire.synctools.storage.BatchOperation.CpoBuilder
@@ -28,7 +26,6 @@ import at.bitfire.synctools.storage.calendar.AndroidEvent2.Companion.EXTNAME_ICA
 import at.bitfire.synctools.storage.calendar.AndroidEvent2.Companion.EXTNAME_URL
 import at.bitfire.synctools.storage.toContentValues
 import java.util.LinkedList
-import at.bitfire.ical4android.AndroidEvent as LegacyAndroidEvent
 
 /**
  * Represents a locally stored calendar, containing [at.bitfire.ical4android.AndroidEvent]s (whose data objects are [at.bitfire.ical4android.Event]s).
@@ -164,17 +161,6 @@ class AndroidCalendar(
         return null
     }
 
-    /**
-     * Gets a specific event, identified by its ID, from this calendar.
-     *
-     * @param id    event ID
-     * @return event (or `null` if not found)
-     */
-    fun getLegacyEvent(id: Long): LegacyAndroidEvent? {
-        val values = getEventValues(id, null) ?: return null
-        return LegacyAndroidEvent(this, values)
-    }
-
     /**
      * Iterates event main rows from this calendar.
      *