Compatibilty updates for ical4j 4.x (#2260)

Author: patrickunterwegs

app/src/androidTest/java/at/techbee/jtx/SyncContentProviderTest.kt

@@ -820,33 +820,33 @@ class SyncContentProviderTest {
 
         // insert 2 icalobjects
         val parentCV = ContentValues().apply {
-            put(at.techbee.jtx.JtxContract.JtxICalObject.SUMMARY, "summary")
-            put(at.techbee.jtx.JtxContract.JtxICalObject.COMPONENT, at.techbee.jtx.JtxContract.JtxICalObject.Component.VJOURNAL.name)
-            put(at.techbee.jtx.JtxContract.JtxICalObject.UID, "AAA")
-            put(at.techbee.jtx.JtxContract.JtxICalObject.ICALOBJECT_COLLECTIONID, defaultCollectionId)
+            put(JtxContract.JtxICalObject.SUMMARY, "summary")
+            put(JtxContract.JtxICalObject.COMPONENT, JtxContract.JtxICalObject.Component.VJOURNAL.name)
+            put(JtxContract.JtxICalObject.UID, "AAA")
+            put(JtxContract.JtxICalObject.ICALOBJECT_COLLECTIONID, defaultCollectionId)
         }
-        mContentResolver?.insert(at.techbee.jtx.JtxContract.JtxICalObject.CONTENT_URI.asSyncAdapter(defaultTestAccount), parentCV)
+        mContentResolver?.insert(JtxContract.JtxICalObject.CONTENT_URI.asSyncAdapter(defaultTestAccount), parentCV)
         val childCV = ContentValues().apply {
-            put(at.techbee.jtx.JtxContract.JtxICalObject.SUMMARY, "summary")
-            put(at.techbee.jtx.JtxContract.JtxICalObject.COMPONENT, at.techbee.jtx.JtxContract.JtxICalObject.Component.VJOURNAL.name)
-            put(at.techbee.jtx.JtxContract.JtxICalObject.UID, "BBB")
-            put(at.techbee.jtx.JtxContract.JtxICalObject.ICALOBJECT_COLLECTIONID, defaultCollectionId)
+            put(JtxContract.JtxICalObject.SUMMARY, "summary")
+            put(JtxContract.JtxICalObject.COMPONENT, JtxContract.JtxICalObject.Component.VJOURNAL.name)
+            put(JtxContract.JtxICalObject.UID, "BBB")
+            put(JtxContract.JtxICalObject.ICALOBJECT_COLLECTIONID, defaultCollectionId)
         }
-        val childUri = mContentResolver?.insert(at.techbee.jtx.JtxContract.JtxICalObject.CONTENT_URI.asSyncAdapter(defaultTestAccount), childCV)
+        val childUri = mContentResolver?.insert(JtxContract.JtxICalObject.CONTENT_URI.asSyncAdapter(defaultTestAccount), childCV)
 
         // link one of them to the other with PARENT reltype
         val parentRelCV = ContentValues().apply {
-            put(at.techbee.jtx.JtxContract.JtxRelatedto.ICALOBJECT_ID, childUri?.lastPathSegment)
-            put(at.techbee.jtx.JtxContract.JtxRelatedto.TEXT, "AAA")
-            put(at.techbee.jtx.JtxContract.JtxRelatedto.RELTYPE, at.techbee.jtx.JtxContract.JtxRelatedto.Reltype.PARENT.name)
+            put(JtxContract.JtxRelatedto.ICALOBJECT_ID, childUri?.lastPathSegment)
+            put(JtxContract.JtxRelatedto.TEXT, "AAA")
+            put(JtxContract.JtxRelatedto.RELTYPE, JtxContract.JtxRelatedto.Reltype.PARENT.name)
         }
         mContentResolver?.insert(JtxContract.JtxRelatedto.CONTENT_URI.asSyncAdapter(defaultTestAccount), parentRelCV)
 
         // check child to parent
         mContentResolver?.query(
-            at.techbee.jtx.JtxContract.JtxRelatedto.CONTENT_URI.asSyncAdapter(defaultTestAccount),
-            arrayOf(at.techbee.jtx.JtxContract.JtxRelatedto.ICALOBJECT_ID, at.techbee.jtx.JtxContract.JtxRelatedto.TEXT, at.techbee.jtx.JtxContract.JtxRelatedto.RELTYPE),
-            "${at.techbee.jtx.JtxContract.JtxRelatedto.ICALOBJECT_ID} = ?",
+            JtxContract.JtxRelatedto.CONTENT_URI.asSyncAdapter(defaultTestAccount),
+            arrayOf(JtxContract.JtxRelatedto.ICALOBJECT_ID, JtxContract.JtxRelatedto.TEXT, JtxContract.JtxRelatedto.RELTYPE),
+            "${JtxContract.JtxRelatedto.ICALOBJECT_ID} = ?",
             arrayOf(childUri?.lastPathSegment),
             null
         ).use {
@@ -861,7 +861,7 @@ class SyncContentProviderTest {
                 it?.getString(1)
             )   // TEXT (UID)
             assertEquals(
-                at.techbee.jtx.JtxContract.JtxRelatedto.Reltype.PARENT.name,
+                JtxContract.JtxRelatedto.Reltype.PARENT.name,
                 it?.getString(2)
             )
         }

app/src/main/java/at/techbee/jtx/contract/JtxContract.kt

@@ -27,7 +27,6 @@ import at.techbee.jtx.contract.JtxContract.JtxICalObject.GEO_LAT
 import at.techbee.jtx.contract.JtxContract.JtxICalObject.GEO_LONG
 import at.techbee.jtx.contract.JtxContract.JtxICalObject.TZ_ALLDAY
 import net.fortuna.ical4j.model.ParameterList
-import net.fortuna.ical4j.model.Property
 import net.fortuna.ical4j.model.PropertyList
 import net.fortuna.ical4j.model.parameter.XParameter
 import net.fortuna.ical4j.model.property.XProperty
@@ -36,7 +35,6 @@ import java.util.logging.Level
 import java.util.logging.Logger
 
 
-@Suppress("unused")
 object JtxContract {
 
     private val logger
@@ -101,8 +99,8 @@ object JtxContract {
      * @param [string] that should be parsed
      * @return The list of XProperty parsed from the string
      */
-    fun getXPropertyListFromJson(string: String): PropertyList<Property> {
-        val propertyList = PropertyList<Property>()
+    fun getXPropertyListFromJson(string: String): PropertyList {
+        val propertyList = PropertyList()
 
         if (string.isBlank())
             return propertyList
@@ -136,7 +134,10 @@ object JtxContract {
             return null
 
         val jsonObject = JSONObject()
-        parameters.forEach { parameter ->
+
+        // Note: probably the contract should be separated from methods that do things, especially if they depend on ical4j
+
+        parameters.all.forEach { parameter ->
             jsonObject.put(parameter.name, parameter.value)
         }
         return if (jsonObject.length() == 0)
@@ -151,12 +152,14 @@ object JtxContract {
      * @param [propertyList] The PropertyList that should be transformed into a Json String
      * @return The generated Json object as a [String]
      */
-    fun getJsonStringFromXProperties(propertyList: PropertyList<*>?): String? {
+    fun getJsonStringFromXProperties(propertyList: PropertyList?): String? {
         if (propertyList == null)
             return null
 
+        // Note: probably the contract should be separated from methods that do things, especially if they depend on ical4j
+
         val jsonObject = JSONObject()
-        propertyList.forEach { property ->
+        propertyList.all.forEach { property ->
             jsonObject.put(property.name, property.value)
         }
         return if (jsonObject.length() == 0)
@@ -181,7 +184,7 @@ object JtxContract {
         stringList.forEach {
             try {
                 longList.add(it.toLong())
-            } catch (e: NumberFormatException) {
+            } catch (_: NumberFormatException) {
                 logger.log(Level.WARNING, "String could not be cast to Long ($it)")
                 return@forEach
             }
@@ -190,7 +193,6 @@ object JtxContract {
     }
 
 
-    @Suppress("unused")
     object JtxICalObject {
 
         /** The name of the the content URI for IcalObjects.
@@ -208,7 +210,7 @@ object JtxContract {
         val VIEW_INTENT_URI: Uri by lazy { "content://$VIEW_INTENT_HOST/$CONTENT_URI_PATH".toUri() }
 
         /* Convenience function to directly build the content URI to view a specific ICalObject in jtx Board by its ID */
-        fun getViewIntentUriFor(iCalObjectId: Long) = Uri.withAppendedPath(VIEW_INTENT_URI, iCalObjectId.toString())
+        fun getViewIntentUriFor(iCalObjectId: Long): Uri = Uri.withAppendedPath(VIEW_INTENT_URI, iCalObjectId.toString())
 
 
 
@@ -648,7 +650,6 @@ object JtxContract {
     }
 
 
-    @Suppress("unused")
     object JtxAttendee {
 
         /** The name of the the table for Attendees that are linked to an ICalObject.
@@ -807,19 +808,16 @@ object JtxContract {
         }
 
         /** This enum class defines the possible values for the attribute [JtxAttendee] for the Component VJOURNAL  */
-        @Suppress("unused")
         enum class PartstatJournal {
             `NEEDS-ACTION`, ACCEPTED, DECLINED
         }
 
         /** This enum class defines the possible values for the attribute [JtxAttendee] for the Component VTODO  */
-        @Suppress("unused")
         enum class PartstatTodo {
             `NEEDS-ACTION`, ACCEPTED, DECLINED, TENTATIVE, DELEGATED, COMPLETED, `IN-PROCESS`
         }
     }
 
-    @Suppress("unused")
     object JtxCategory {
 
         /** The name of the the table for Categories that are linked to an ICalObject.
@@ -869,7 +867,7 @@ object JtxContract {
         const val OTHER = "other"
     }
 
-    @Suppress("unused")
+
     object JtxComment {
 
         /** The name of the the table for Comments that are linked to an ICalObject.
@@ -927,7 +925,7 @@ object JtxContract {
     }
 
 
-    @Suppress("unused")
+
     object JtxOrganizer {
         /** The name of the the table for Organizer that are linked to an ICalObject.
          * [https://tools.ietf.org/html/rfc5545#section-3.8.4.3]
@@ -1006,7 +1004,7 @@ object JtxContract {
 
     }
 
-    @Suppress("unused")
+
     object JtxRelatedto {
 
         /** The name of the the table for Relationships (related-to) that are linked to an ICalObject.
@@ -1076,7 +1074,7 @@ object JtxContract {
 
     }
 
-    @Suppress("unused")
+
     object JtxResource {
         /** The name of the the table for Resources that are linked to an ICalObject.
          * [https://tools.ietf.org/html/rfc5545#section-3.8.1.10]*/
@@ -1126,7 +1124,7 @@ object JtxContract {
 
     }
 
-    @Suppress("unused")
+
     object JtxCollection {
 
         /** The name of the the table for Collections
@@ -1250,7 +1248,7 @@ object JtxContract {
     }
 
 
-    @Suppress("unused")
+
     object JtxAttachment {
 
         /** The name of the the table for Attachments that are linked to an ICalObject.*/
@@ -1314,7 +1312,7 @@ object JtxContract {
     }
 
 
-    @Suppress("unused")
+
     object JtxAlarm {
 
         /** The name of the the table for Alarms that are linked to an ICalObject.*/
@@ -1448,19 +1446,17 @@ object JtxContract {
         const val TRIGGER_RELATIVE_DURATION = "triggerRelativeDuration"
 
         /** This enum class defines the possible values for the attribute [TRIGGER_RELATIVE_TO] for the Component VALARM  */
-        @Suppress("unused")
         enum class AlarmRelativeTo {
             START, END
         }
 
         /** This enum class defines the possible values for the attribute [ACTION] for the Component VALARM  */
-        @Suppress("unused")
         enum class AlarmAction {
             AUDIO, DISPLAY, EMAIL
         }
     }
 
-    @Suppress("unused")
+
     object JtxUnknown {
 
         /** The name of the the table for Unknown properties that are linked to an ICalObject.*/