Skip to content

Avoid NPE when missing DTSTART for recurring events #1336

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

Merged
merged 20 commits into from
Apr 16, 2025
Merged

Avoid NPE when missing DTSTART for recurring events #1336

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4c7c890
Added handling of null dtstart
ArnyminerZ Mar 7, 2025
2709233
Added JtxSyncManagerTest
ArnyminerZ Mar 11, 2025
4357545
Test recurrence id without dtstart does not cause NPE
sunkup Apr 8, 2025
67e4bd7
Extract syncmanager creation from try-catch
sunkup Apr 8, 2025
9781223
Add tests
sunkup Apr 14, 2025
fc4250d
Assert RRULE remains in main vtodo
sunkup Apr 14, 2025
6915602
Skip tests when jtx board not installed
sunkup Apr 14, 2025
ec45659
Correct annotation
sunkup Apr 14, 2025
40cf8fd
Simplify null checks
sunkup Apr 14, 2025
7e13da7
Extract recurid definition
sunkup Apr 14, 2025
efee743
Update ical4android
sunkup Apr 15, 2025
e0f0043
Find recurrence instance without dtstart
sunkup Apr 15, 2025
32bec93
Rename method for clarity and update kdoc
sunkup Apr 15, 2025
72971bf
Use new method in test too
sunkup Apr 15, 2025
fee2e25
Fix lint warnings
sunkup Apr 15, 2025
18a5142
Merge branch 'main-ose' into 1265-jtx-board-task-sync-causes-nullpoin…
sunkup Apr 15, 2025
ac75029
Use a custom rule to wrap and ignore security exception if jtxboard i…
sunkup Apr 16, 2025
b8ff89e
Use existing permission utils
sunkup Apr 16, 2025
15f5300
Rename capture to catch exceptions rule
sunkup Apr 16, 2025
ed1701c
Format code
sunkup Apr 16, 2025
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
9 changes: 7 additions & 2 deletions app/src/main/kotlin/at/bitfire/davdroid/sync/JtxSyncManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,14 @@ class JtxSyncManager @AssistedInject constructor(

icalobjects.forEach { jtxICalObject ->
// if the entry is a recurring entry (and therefore has a recurid)
// we udpate the existing (generated) entry
// we update the existing (generated) entry
if(jtxICalObject.recurid != null) {
val local = localCollection.findRecurring(jtxICalObject.uid, jtxICalObject.recurid!!, jtxICalObject.dtstart!!)
val local = jtxICalObject.dtstart?.let { dtstart ->
localCollection.findRecurring(jtxICalObject.uid, jtxICalObject.recurid!!, dtstart)
} ?: run {
logger.log(Level.INFO, "Got a recur instance (${jtxICalObject.recurid}/${jtxICalObject.uid}) with an invalid dtstart.")
null
}
SyncException.wrapWithLocalResource(local) {
logger.log(Level.INFO, "Updating $fileName with recur instance ${jtxICalObject.recurid} in local list", jtxICalObject)
if(local != null) {
Expand Down