Skip to content

Commit 524a3f5

Browse files
rfc2822rfc2822
committed
Move getLegacyEvent to LegacyAndroidCalendar
1 parent b58a0f6 commit 524a3f5

File tree

4 files changed

+27
-34
lines changed

4 files changed

+27
-34
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class AndroidEventTest {
9696
val uri = legacyCalendar.add(event)
9797

9898
// update test event in calendar
99-
val testEvent = calendar.getLegacyEvent(ContentUris.parseId(uri))!!
99+
val testEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri))!!
100100
val event2 = legacyCalendar.getEvent(testEvent.id)!!
101101
event2.summary = "Updated event"
102102
// add data rows
@@ -108,7 +108,7 @@ class AndroidEventTest {
108108
assertEquals(ContentUris.parseId(uri), ContentUris.parseId(uri2))
109109

110110
// read again and verify result
111-
val updatedEvent = calendar.getLegacyEvent(ContentUris.parseId(uri2))!!
111+
val updatedEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri2))!!
112112
try {
113113
val event3 = legacyCalendar.getEvent(updatedEvent.id)!!
114114
assertEquals(event2.summary, event3.summary)
@@ -131,15 +131,15 @@ class AndroidEventTest {
131131
val id = ContentUris.parseId(uri)
132132

133133
// verify that it has color
134-
val beforeUpdate = calendar.getLegacyEvent(id)!!
134+
val beforeUpdate = legacyCalendar.getAndroidEvent(calendar, id)!!
135135
assertNotNull(legacyCalendar.getEvent(beforeUpdate.id)!!.color)
136136

137137
// update: reset color
138138
event.color = null
139139
beforeUpdate.update(event)
140140

141141
// verify that it doesn't have color anymore
142-
val afterUpdate = calendar.getLegacyEvent(id)!!
142+
val afterUpdate = legacyCalendar.getAndroidEvent(calendar, id)!!
143143
assertNull(legacyCalendar.getEvent(afterUpdate.id)!!.color)
144144
}
145145

@@ -153,7 +153,7 @@ class AndroidEventTest {
153153
val uri = legacyCalendar.add(event)
154154

155155
// update test event in calendar
156-
val testEvent = calendar.getLegacyEvent(ContentUris.parseId(uri))!!
156+
val testEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri))!!
157157
val event2 = legacyCalendar.getEvent(testEvent.id)!!
158158
event2.summary = "Sample event without STATUS"
159159
event2.status = Status.VEVENT_CONFIRMED
@@ -163,7 +163,7 @@ class AndroidEventTest {
163163
assertEquals(ContentUris.parseId(uri), ContentUris.parseId(uri2))
164164

165165
// read again and verify result
166-
val updatedEvent = calendar.getLegacyEvent(ContentUris.parseId(uri2))!!
166+
val updatedEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri2))!!
167167
try {
168168
val event3 = legacyCalendar.getEvent(updatedEvent.id)!!
169169
assertEquals(Status.VEVENT_CONFIRMED, event3.status)
@@ -183,7 +183,7 @@ class AndroidEventTest {
183183
val uri = legacyCalendar.add(event)
184184

185185
// update test event in calendar
186-
val testEvent = calendar.getLegacyEvent(ContentUris.parseId(uri))!!
186+
val testEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri))!!
187187
val event2 = legacyCalendar.getEvent(testEvent.id)!!
188188
event2.summary = "Sample event without STATUS"
189189
event2.status = null
@@ -193,7 +193,7 @@ class AndroidEventTest {
193193
assertNotEquals(ContentUris.parseId(uri), ContentUris.parseId(uri2))
194194

195195
// read again and verify result
196-
val updatedEvent = calendar.getLegacyEvent(ContentUris.parseId(uri2))!!
196+
val updatedEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri2))!!
197197
try {
198198
val event3 = legacyCalendar.getEvent(updatedEvent.id)!!
199199
assertNull(event3.status)
@@ -214,7 +214,7 @@ class AndroidEventTest {
214214
event.attendees += Attendee(URI("mailto:att$i@example.com"))
215215
val uri = legacyCalendar.add(event)
216216

217-
val testEvent = calendar.getLegacyEvent(ContentUris.parseId(uri))!!
217+
val testEvent = legacyCalendar.getAndroidEvent(calendar, ContentUris.parseId(uri))!!
218218
try {
219219
assertEquals(20, legacyCalendar.getEvent(testEvent.id)!!.attendees.size)
220220
} finally {

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ import android.accounts.Account
1010
import android.content.ContentProviderClient
1111
import android.content.ContentUris
1212
import android.content.ContentValues
13-
import android.net.Uri
1413
import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
1514
import android.provider.CalendarContract.AUTHORITY
1615
import android.provider.CalendarContract.Attendees
17-
import android.provider.CalendarContract.Calendars
1816
import android.provider.CalendarContract.Events
1917
import android.provider.CalendarContract.ExtendedProperties
2018
import android.provider.CalendarContract.Reminders
@@ -77,8 +75,8 @@ class LegacyAndroidEventProcessorTest {
7775
private val tzVienna = tzRegistry.getTimeZone("Europe/Vienna")!!
7876
private val tzShanghai = tzRegistry.getTimeZone("Asia/Shanghai")!!
7977

80-
private lateinit var calendarUri: Uri
8178
private lateinit var calendar: AndroidCalendar
79+
lateinit var legacyCalendar: LegacyAndroidCalendar
8280
lateinit var client: ContentProviderClient
8381

8482
@Before
@@ -87,7 +85,7 @@ class LegacyAndroidEventProcessorTest {
8785
client = context.contentResolver.acquireContentProviderClient(AUTHORITY)!!
8886

8987
calendar = TestCalendar.findOrCreate(testAccount, client)
90-
calendarUri = ContentUris.withAppendedId(Calendars.CONTENT_URI, calendar.id)
88+
legacyCalendar = LegacyAndroidCalendar(calendar)
9189
}
9290

9391
@After
@@ -135,7 +133,7 @@ class LegacyAndroidEventProcessorTest {
135133
client.insert(ExtendedProperties.CONTENT_URI.asSyncAdapter(testAccount), extendedValues)
136134
}
137135

138-
return destinationCalendar.getLegacyEvent(id)!!
136+
return legacyCalendar.getAndroidEvent(destinationCalendar, id)!!
139137
}
140138

141139
private fun populateEvent(

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import at.bitfire.synctools.storage.calendar.CalendarBatchOperation
1717
/**
1818
* Provides legacy features (read/write of legacy [Event]s), based on the new [AndroidCalendar].
1919
*/
20+
@Deprecated("Use AndroidCalendar instead")
2021
class LegacyAndroidCalendar(
2122
private val calendar: AndroidCalendar
2223
) {
@@ -49,6 +50,17 @@ class LegacyAndroidCalendar(
4950
return resultUri
5051
}
5152

53+
/**
54+
* Gets a specific legacy [AndroidEvent], identified by the event ID, from this calendar.
55+
*
56+
* @param id event ID
57+
* @return event (or `null` if not found)
58+
*/
59+
fun getAndroidEvent(androidCalendar: AndroidCalendar, id: Long): AndroidEvent? {
60+
val values = androidCalendar.getEventValues(id, null) ?: return null
61+
return AndroidEvent(androidCalendar, values)
62+
}
63+
5264
/**
5365
* Gets an [Event] data object from an Android event with a specific ID.
5466
*

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

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,12 @@ import android.provider.CalendarContract.Events
1717
import android.provider.CalendarContract.EventsEntity
1818
import android.provider.CalendarContract.ExtendedProperties
1919
import android.provider.CalendarContract.Reminders
20-
21-
2220
import at.bitfire.ical4android.UnknownProperty
2321
import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
2422
import at.bitfire.synctools.storage.BatchOperation.CpoBuilder
2523
import at.bitfire.synctools.storage.LocalStorageException
26-
import at.bitfire.synctools.storage.calendar.AndroidEvent2.Companion.EXTNAME_CATEGORIES
27-
import at.bitfire.synctools.storage.calendar.AndroidEvent2.Companion.EXTNAME_ICAL_UID
28-
import at.bitfire.synctools.storage.calendar.AndroidEvent2.Companion.EXTNAME_URL
2924
import at.bitfire.synctools.storage.toContentValues
3025
import java.util.LinkedList
31-
import at.bitfire.ical4android.AndroidEvent as LegacyAndroidEvent
3226

3327
/**
3428
* Represents a locally stored calendar, containing [at.bitfire.ical4android.AndroidEvent]s (whose data objects are [at.bitfire.ical4android.Event]s).
@@ -164,17 +158,6 @@ class AndroidCalendar(
164158
return null
165159
}
166160

167-
/**
168-
* Gets a specific event, identified by its ID, from this calendar.
169-
*
170-
* @param id event ID
171-
* @return event (or `null` if not found)
172-
*/
173-
fun getLegacyEvent(id: Long): LegacyAndroidEvent? {
174-
val values = getEventValues(id, null) ?: return null
175-
return LegacyAndroidEvent(this, values)
176-
}
177-
178161
/**
179162
* Iterates event main rows from this calendar.
180163
*
@@ -291,9 +274,9 @@ class AndroidCalendar(
291274
"${ExtendedProperties.EVENT_ID}=? AND ${ExtendedProperties.NAME} IN (?,?,?,?)",
292275
arrayOf(
293276
eventId.toString(),
294-
EXTNAME_CATEGORIES,
295-
EXTNAME_ICAL_UID, // UID is stored in UID_2445, don't leave iCalUid rows in events that we have written
296-
EXTNAME_URL,
277+
AndroidEvent2.EXTNAME_CATEGORIES,
278+
AndroidEvent2.EXTNAME_ICAL_UID, // UID is stored in UID_2445, don't leave iCalUid rows in events that we have written
279+
AndroidEvent2.EXTNAME_URL,
297280
UnknownProperty.CONTENT_ITEM_TYPE
298281
)
299282
)

0 commit comments

Comments
 (0)