Skip to content

Fix JtxICalObject update mistakes #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunkup wants to merge 6 commits into
base: ical4j-3to4
Choose a base branch
from
+206 −230
Open

Fix JtxICalObject update mistakes #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
60090d5
Fix JtxICalObject update mistakes
sunkup Mar 26, 2026
24c8cf4
Minor changes and comments
sunkup Mar 26, 2026
ca2d8c1
Fix helpers after rebase
sunkup Mar 26, 2026
afead7f
Rename variable
sunkup Mar 26, 2026
3888395
Use Temporal.toTimestamp() from AndroidTimeUtils and remove Temporal.…
sunkup Mar 26, 2026
0f1b77e
Minor changes
sunkup Mar 27, 2026
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
16 changes: 8 additions & 8 deletions lib/src/androidTest/kotlin/at/bitfire/ical4android/JtxICalObjectTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import androidx.core.content.pm.PackageInfoCompat
import androidx.test.platform.app.InstrumentationRegistry
import at.bitfire.ical4android.impl.TestJtxCollection
import at.bitfire.ical4android.impl.testProdId

import at.bitfire.synctools.icalendar.ICalendarParser
import at.bitfire.synctools.test.GrantPermissionOrSkipRule
import at.techbee.jtx.JtxContract
import at.techbee.jtx.JtxContract.JtxICalObject
Expand All @@ -35,6 +35,7 @@ import org.junit.Rule
import org.junit.Test
import java.io.ByteArrayOutputStream
import java.io.InputStreamReader
import kotlin.jvm.optionals.getOrNull

class JtxICalObjectTest {

Expand Down Expand Up @@ -837,17 +838,16 @@ class JtxICalObjectTest {
//assertEquals(iCalIn.components[0].getProperty(Component.VTODO), iCalOut.components[0].getProperty(Component.VTODO))

// there should only be one component for VJOURNAL and VTODO!
TODO("ical4j 4.x")
/*for(i in 0 until iCalIn.components.size) {
for(i in 0 until iCalIn.componentList.all.size) {

iCalIn.components[i].properties.forEach { inProp ->
iCalIn.componentList.all[i].propertyList.all.forEach { inProp ->

if(inProp.name == "DTSTAMP" || exceptions?.contains(inProp.name) == true)
return@forEach
val outProp = iCalOut.components[i].properties.getProperty<Property>(inProp.name)
val outProp = iCalOut.componentList.all[i].propertyList.getFirst<Property>(inProp.name)?.getOrNull()
assertEquals(inProp, outProp)
}
}*/
}
}


Expand All @@ -861,7 +861,7 @@ class JtxICalObjectTest {
val stream = javaClass.classLoader!!.getResourceAsStream(filename)
val reader = InputStreamReader(stream, Charsets.UTF_8)

val iCalIn = ICalendar.fromReader(reader)
val iCalIn = ICalendarParser().parse(reader)

stream.close()
reader.close()
Expand All @@ -885,7 +885,7 @@ class JtxICalObjectTest {

iCalObject[0].write(os, testProdId)

val iCalOut = ICalendar.fromReader(os.toByteArray().inputStream().reader())
val iCalOut = ICalendarParser().parse(os.toByteArray().inputStream().reader())

stream.close()
reader.close()
Expand Down
5 changes: 2 additions & 3 deletions lib/src/main/kotlin/at/bitfire/ical4android/JtxCollection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import at.bitfire.synctools.storage.toContentValues
import at.techbee.jtx.JtxContract
import at.techbee.jtx.JtxContract.asSyncAdapter
import net.fortuna.ical4j.model.Calendar
import net.fortuna.ical4j.model.component.CalendarComponent
import net.fortuna.ical4j.model.component.VJournal
import net.fortuna.ical4j.model.component.VToDo
import net.fortuna.ical4j.model.property.ProdId
Expand Down Expand Up @@ -268,9 +267,9 @@ open class JtxCollection<out T: JtxICalObject>(val account: Account,
val jtxIcalObject = JtxICalObject(this)
jtxIcalObject.populateFromContentValues(cursor.toContentValues())
val singleICS = jtxIcalObject.getICalendarFormat(prodId)
singleICS?.getComponents<CalendarComponent>()?.forEach { component ->
singleICS?.componentList?.all?.forEach { component ->
if(component is VToDo || component is VJournal)
ical.getComponents<CalendarComponent>() += component
ical += component
}
}
return ical.toString()
Expand Down
Loading