Use StringDef to annotate possible service and collection types (#1227)

* Add StringDef annotation to collection type param * Add StringDef annotation to service type param
bitfireAT · Jan 9, 2025 · 843013a · 843013a
1 parent ac8de37
commit 843013a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/db/Collection.kt b/app/src/main/kotlin/at/bitfire/davdroid/db/Collection.kt
@@ -4,6 +4,7 @@
 
 package at.bitfire.davdroid.db
 
+import androidx.annotation.StringDef
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
@@ -29,6 +30,14 @@ import at.bitfire.ical4android.util.DateUtils
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
+@Retention(AnnotationRetention.SOURCE)
+@StringDef(
+    Collection.TYPE_ADDRESSBOOK,
+    Collection.TYPE_CALENDAR,
+    Collection.TYPE_WEBCAL
+)
+annotation class CollectionType
+
 @Entity(tableName = "collection",
     foreignKeys = [
         ForeignKey(entity = Service::class, parentColumns = arrayOf("id"), childColumns = arrayOf("serviceId"), onDelete = ForeignKey.CASCADE),
@@ -67,7 +76,8 @@ data class Collection(
     /**
      * Type of service. CalDAV or CardDAV
      */
-    var type: String,
+    @CollectionType
+    val type: String,
 
     /**
      * Address where this collection lives - with trailing slash

diff --git a/app/src/main/kotlin/at/bitfire/davdroid/db/Service.kt b/app/src/main/kotlin/at/bitfire/davdroid/db/Service.kt
@@ -4,11 +4,16 @@
 
 package at.bitfire.davdroid.db
 
+import androidx.annotation.StringDef
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import okhttp3.HttpUrl
 
+@Retention(AnnotationRetention.SOURCE)
+@StringDef(Service.TYPE_CALDAV, Service.TYPE_CARDDAV)
+annotation class ServiceType
+
 /**
  * A service entity.
  *
@@ -24,6 +29,8 @@ data class Service(
     var id: Long,
 
     var accountName: String,
+
+    @ServiceType
     var type: String,
 
     var principal: HttpUrl?