Skip to content
This repository was archived by the owner on Jun 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,31 @@ class JtxCollectionTest {
assertEquals(1, icalobjects.size)
}

@Test
fun queryRecur_test() {
val collectionUri = JtxCollection.create(testAccount, client, cv)
assertNotNull(collectionUri)

val collections = JtxCollection.find(testAccount, client, context, TestJtxCollection.Factory, null, null)
val item = collections[0].queryRecur("abc1234", "xyz5678")
assertNull(item)

val cv = ContentValues().apply {
put(JtxContract.JtxICalObject.UID, "abc1234")
put(JtxContract.JtxICalObject.RECURID, "xyz5678")
put(JtxContract.JtxICalObject.RECURID_TIMEZONE, "Europe/Vienna")
put(JtxContract.JtxICalObject.SUMMARY, "summary")
put(JtxContract.JtxICalObject.COMPONENT, JtxContract.JtxICalObject.Component.VJOURNAL.name)
put(JtxContract.JtxICalObject.ICALOBJECT_COLLECTIONID, collections[0].id)
}
client.insert(JtxContract.JtxICalObject.CONTENT_URI.asSyncAdapter(testAccount), cv)
val contentValues = collections[0].queryRecur("abc1234", "xyz5678")

assertEquals("abc1234", contentValues?.getAsString(JtxContract.JtxICalObject.UID))
assertEquals("xyz5678", contentValues?.getAsString(JtxContract.JtxICalObject.RECURID))
assertEquals("Europe/Vienna", contentValues?.getAsString(JtxContract.JtxICalObject.RECURID_TIMEZONE))
}

@Test
fun getICSForCollection_test() {
val collectionUri = JtxCollection.create(testAccount, client, cv)
Expand Down
9 changes: 5 additions & 4 deletions lib/src/main/kotlin/at/bitfire/ical4android/JtxCollection.kt
Original file line number Diff line number Diff line change
Expand Up @@ -181,18 +181,19 @@ open class JtxCollection<out T: JtxICalObject>(val account: Account,

/**
* @param [uid] of the entry that should be retrieved as content values
* @param [recurid] of the entry that should be retrieved as content values
* @return Content Values of the found item with the given UID or null if the result was empty or more than 1
* The query checks for the [uid] within all collections of this account, not only the current collection.
*/
fun queryRecur(uid: String, recurid: String, dtstart: Long): ContentValues? {
fun queryRecur(uid: String, recurid: String): ContentValues? {
client.query(
JtxContract.JtxICalObject.CONTENT_URI.asSyncAdapter(account),
null,
"${JtxContract.JtxICalObject.UID} = ? AND ${JtxContract.JtxICalObject.RECURID} = ? AND ${JtxContract.JtxICalObject.DTSTART} = ?",
arrayOf(uid, recurid, dtstart.toString()),
"${JtxContract.JtxICalObject.UID} = ? AND ${JtxContract.JtxICalObject.RECURID} = ?",
arrayOf(uid, recurid),
null
).use { cursor ->
logger.fine("queryByUID: found ${cursor?.count} records in ${account.name}")
logger.fine("queryRecur: found ${cursor?.count} records in ${account.name}")
if (cursor?.count != 1)
return null
cursor.moveToFirst()
Expand Down
Loading