Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce388590 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Don't reuse ical4j parameter/property factories in possibly different threads;... 

Don't reuse ical4j parameter/property factories in possibly different threads; update Android dependencies
parent 13e85f0b

build.gradle

+5 −5
Original line number Diff line number Diff line 


buildscript {

    ext.versions = [

        kotlin: '1.3.31',

        dokka: '0.9.17',

        kotlin: '1.3.40',

        dokka: '0.9.18',

        ical4j: '2.2.4'

    ]
@@ -60,9 +60,9 @@ dependencies { 
    implementation 'org.slf4j:slf4j-jdk14:1.7.25'

    implementation 'androidx.core:core-ktx:1.0.2'



    androidTestImplementation 'androidx.test:core:1.1.0'

    androidTestImplementation 'androidx.test:runner:1.1.1'

    androidTestImplementation 'androidx.test:rules:1.1.1'

    androidTestImplementation 'androidx.test:core:1.2.0'

    androidTestImplementation 'androidx.test:runner:1.2.0'

    androidTestImplementation 'androidx.test:rules:1.2.0'



    testImplementation 'junit:junit:4.12'

}

src/main/java/at/bitfire/ical4android/AndroidEvent.kt

+5 −2
Original line number Diff line number Diff line
@@ -753,6 +753,9 @@ abstract class AndroidEvent( 
     */

    object UnknownProperty {



        private val parameterFactory = ParameterFactoryRegistry()

        private val propertyFactory = PropertyFactoryRegistry()



        /**

         * Deserializes a JSON string from an ExtendedProperty value to an ical4j property.

         *
@@ -768,13 +771,13 @@ abstract class AndroidEvent( 
            val params = ParameterList()

            json.optJSONObject(2)?.let { jsonParams ->

                for (paramName in jsonParams.keys())

                    params.add(ICalendar.parameterFactoryRegistry.createParameter(

                    params.add(parameterFactory.createParameter(

                            paramName,

                            jsonParams.getString(paramName)

                    ))

            }



            return ICalendar.propertyFactoryRegistry.createProperty(name, params, value)

            return propertyFactory.createProperty(name, params, value)

        }



        /**

src/main/java/at/bitfire/ical4android/Event.kt

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


package at.bitfire.ical4android



import net.fortuna.ical4j.data.CalendarBuilder

import net.fortuna.ical4j.data.CalendarOutputter

import net.fortuna.ical4j.data.ParserException

import net.fortuna.ical4j.model.Calendar
@@ -75,7 +76,7 @@ class Event: ICalendar() { 
            // parse stream

            val ical: Calendar

            try {

                ical = calendarBuilder().build(reader)

                ical = CalendarBuilder().build(reader)

            } catch(e: ParserException) {

                throw InvalidCalendarException("Couldn't parse iCalendar object", e)

            } catch(e: IllegalArgumentException) {

src/main/java/at/bitfire/ical4android/ICalendar.kt

+0 −8
Original line number Diff line number Diff line
@@ -38,14 +38,6 @@ open class ICalendar { 
        }



        var prodId = ProdId("+//IDN bitfire.at//ical4android")

        val propertyFactoryRegistry = PropertyFactoryRegistry()

        val parameterFactoryRegistry = ParameterFactoryRegistry()



        @JvmStatic

        protected fun calendarBuilder() = CalendarBuilder(

                CalendarParserFactory.getInstance().createParser(),

                propertyFactoryRegistry, parameterFactoryRegistry,

                TimeZoneRegistryFactory.getInstance().createRegistry())





        // time zone helpers

src/main/java/at/bitfire/ical4android/Task.kt

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


package at.bitfire.ical4android



import net.fortuna.ical4j.data.CalendarBuilder

import net.fortuna.ical4j.data.CalendarOutputter

import net.fortuna.ical4j.data.ParserException

import net.fortuna.ical4j.model.*
@@ -64,7 +65,7 @@ class Task: ICalendar() { 
        fun fromReader(reader: Reader): List<Task> {

            val ical: Calendar

            try {

                ical = calendarBuilder().build(reader)

                ical = CalendarBuilder().build(reader)

            } catch(e: ParserException) {

                throw InvalidCalendarException("Couldn't parse iCalendar object", e)

            } catch(e: IllegalArgumentException) {