Skip to content

Stop subclassing AndroidEvent #786

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
sunkup merged 3 commits into from
Jan 28, 2026
Merged

Stop subclassing AndroidEvent #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
190c294
Update synctools version
sunkup Jan 14, 2026
86cfce6
Refactor LocalEvent to remove subclassing of AndroidEvent
sunkup Jan 14, 2026
7e71220
Downgrade androidx test rules and runner
ArnyminerZ Jan 16, 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
3 changes: 2 additions & 1 deletion app/src/main/java/at/bitfire/icsdroid/ProcessEventsTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import android.content.Intent
import android.net.Uri
import android.util.Log
import androidx.core.app.NotificationCompat
import at.bitfire.ical4android.AndroidEvent
import at.bitfire.ical4android.Event
import at.bitfire.ical4android.util.DateUtils
import at.bitfire.icsdroid.calendar.LocalCalendar
Expand Down Expand Up @@ -232,7 +233,7 @@ class ProcessEventsTask(
val localEvents = calendar.queryByUID(uid)
if (localEvents.isEmpty()) {
Log.d(Constants.TAG, "$uid not in local calendar, adding")
LocalEvent(calendar, event).add()
LocalEvent(AndroidEvent(calendar, event, null, null, null, 0)).add()
} else {
val localEvent = localEvents.first()

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/at/bitfire/icsdroid/calendar/LocalCalendar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class LocalCalendar private constructor(
account: Account,
provider: ContentProviderClient,
id: Long
) : AndroidCalendar<LocalEvent>(account, provider, LocalEvent.Factory, id) {
) : AndroidCalendar(account, provider, id) {

companion object {

Expand Down
26 changes: 5 additions & 21 deletions app/src/main/java/at/bitfire/icsdroid/calendar/LocalEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,10 @@

package at.bitfire.icsdroid.calendar

import android.content.ContentValues
import at.bitfire.ical4android.AndroidCalendar
import at.bitfire.ical4android.AndroidEvent
import at.bitfire.ical4android.AndroidEventFactory
import at.bitfire.ical4android.Event

class LocalEvent: AndroidEvent {

constructor(calendar: AndroidCalendar<*>, event: Event)
: super(calendar, event, null, null, null, 0)

private constructor(calendar: AndroidCalendar<*>, values: ContentValues)
: super(calendar, values)


object Factory: AndroidEventFactory<LocalEvent> {

override fun fromProvider(calendar: AndroidCalendar<AndroidEvent>, values: ContentValues) =
LocalEvent(calendar, values)

}

}
class LocalEvent(
val androidEvent: AndroidEvent
) {
fun add() = androidEvent.add()
}
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ androidx-hilt = "1.3.0"
androidx-lifecycle = "2.10.0"
androidx-nav3 = "1.0.0"
androidx-test-junit = "1.3.0"
androidx-test-rules = "1.7.0"
androidx-test-runner = "1.7.0"
androidx-test-rules = "1.6.1"
androidx-test-runner = "1.6.1"
androidx-work = "2.11.0"
bitfire-cert4android = "b6b7ef3f10"
bitfire-synctools = "d10d516883"
bitfire-synctools = "9db5cb5dc6"
compose-dialogs = "1.3.0"
compose-material = "1.7.8"
compose-material3 = "1.4.0"
Expand Down