AndroidEvent: move companion object methods to where they belong to #38
Conversation
This file contains hidden or 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
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR relocates AndroidEvent companion object methods into AndroidCalendar, cleans up related imports, and updates tests to use the new API.
- Moved
numDirectInstances,numInstances, and deletion helper fromAndroidEventcompanion intoAndroidCalendar - Added
updateEventinAndroidCalendarfor row updates - Refactored tests and
InitCalendarProviderRuleto callcalendar.numInstances(...)and removed deprecated companion tests
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| lib/src/main/kotlin/at/bitfire/synctools/test/InitCalendarProviderRule.kt | Replaced AndroidEvent.numInstances calls with calendar.numInstances, removed unused import |
| lib/src/main/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendar.kt | Added updateEvent, numDirectInstances, and numInstances methods for event-instance logic |
| lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt | Removed companion object methods (markAsDeleted, instance counters) and related imports |
| lib/src/androidTest/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendarTest.kt | Expanded tests for direct/total instance counts, adjusted assertions for Android version differences |
| lib/src/androidTest/kotlin/at/bitfire/ical4android/impl/TestCalendar.kt | Added withColors parameter to findOrCreate to control color provisioning |
| lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidEventTest.kt | Updated to use TestCalendar.findOrCreate(..., withColors = true) and removed companion-based tests |
Comments suppressed due to low confidence (1)
lib/src/main/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendar.kt:192
- Typo in comment: change "occurence" to "occurrence" for correct spelling.
// if this event doesn't have a last occurrence, it's endless and always has instances
lib/src/main/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendar.kt
Outdated
Show resolved
Hide resolved
lib/src/main/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendar.kt
Outdated
Show resolved
Hide resolved
lib/src/androidTest/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendarTest.kt
Show resolved
Hide resolved
rfc2822
force-pushed
the
androidevent-companion2
branch
from
bb2a273 to
c54fafe
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Move the remaining
AndroidEventcompanion object methods toAndroidCalendarso that the way is free for refactoring the actual event data access.