Fix recurring events with unsupported rrules. #1465
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The android calendar provider does not support RRULE's with BYSETPOS or BYWEEKNO properly, so additional processing has to be done to ensure that duplicate events are not added to the calendar.
tchernobog
reviewed
Oct 6, 2023
Comment on lines
+411
to
+422
| Date date = new java.util.Date(startTime); | ||
|
|
||
| // We'll use SimpleDateFormat to get the D/M/Y but we also need to set the timezone. | ||
| SimpleDateFormat sdf = new java.text.SimpleDateFormat(); | ||
| sdf.setTimeZone(java.util.TimeZone.getTimeZone("GMT")); | ||
|
|
||
| sdf.applyPattern("yyyy"); | ||
| int startYear = Integer.parseInt(sdf.format(date)); | ||
| sdf.applyPattern("MM"); | ||
| int startMonth = Integer.parseInt(sdf.format(date)) - 1; | ||
| sdf.applyPattern("dd"); | ||
| int startDay = Integer.parseInt(sdf.format(date)); |
There was a problem hiding this comment.
Wouldn't it be preferrable to use java.time.LocalDateTime instead and work with epoch, since you have no associated timezone?
Untested and uncompiled:
long firstInstance = LocalDateTime
.ofEpochSecond(startTime / 1000, (startTime % 1000) * 1000000)
.toLocalDate() // clamping to day start
.toInstant()
.toEpochMillis();
// comparison:
if (instance.getTimestamp() != firstInstance) {
return 0;
} // etc.There was a problem hiding this comment.
It needs to resolve out to a DateTime object to pass into RecurrenceSet(), so I could work with epoch's in some of the code, but in the end it still needs to be a DateTime object, so no real point in doing both.
|
thanks for your contribution, this looks fine to me, but I have not tested it. |
jspricke
reviewed
Oct 17, 2023
Gitsaibot
reviewed
Oct 19, 2023
|
Tested and works. Thanks for solving the issue. |
Gitsaibot
approved these changes
Oct 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The android calendar provider does not support RRULE's with BYSETPOS or BYWEEKNO properly, so additional processing has to be done to ensure that duplicate events are not added to the calendar.
This is accomplished by using a separate RRULE processor, lib-recur, to double check that the instance is valid.
Resolves #1132