Stop subclassing AndroidEvent (#786)

* Update synctools version

* Refactor LocalEvent to remove subclassing of AndroidEvent

- Update LocalEvent to use composition over inheritance.
- Modify LocalCalendar to not use AndroidEventFactory.
- Adjust ProcessEventsTask to instantiate LocalEvent with AndroidEvent.

* Downgrade androidx test rules and runner

Signed-off-by: Arnau Mora <[email protected]>

---------

Signed-off-by: Arnau Mora <[email protected]>
Co-authored-by: Arnau Mora <[email protected]>

Author: sunkup

app/src/main/java/at/bitfire/icsdroid/ProcessEventsTask.kt

@@ -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
@@ -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()
 

app/src/main/java/at/bitfire/icsdroid/calendar/LocalCalendar.kt

@@ -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 {
 

app/src/main/java/at/bitfire/icsdroid/calendar/LocalEvent.kt

@@ -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()
+}

gradle/libs.versions.toml

@@ -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"