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

Commit f661a07a authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch 'upstream/master'

parents 05b97db3 c61e4b0c

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line 
distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

src/main/kotlin/at/bitfire/dav4jvm/property/GetContentLength.kt

+8 −2
Original line number Diff line number Diff line
@@ -6,10 +6,12 @@ 


package at.bitfire.dav4jvm.property



import at.bitfire.dav4jvm.Dav4jvm

import at.bitfire.dav4jvm.Property

import at.bitfire.dav4jvm.PropertyFactory

import at.bitfire.dav4jvm.XmlUtils

import org.xmlpull.v1.XmlPullParser

import java.util.logging.Level



data class GetContentLength(

        val contentLength: Long
@@ -23,8 +25,12 @@ data class GetContentLength( 
        override fun getName() = NAME



        override fun create(parser: XmlPullParser): GetContentLength? {

            XmlUtils.readText(parser)?.let {

                return GetContentLength(it.toLong())

            XmlUtils.readText(parser)?.let { valueStr ->

                try {

                    return GetContentLength(valueStr.toLong())

                } catch(e: NumberFormatException) {

                    Dav4jvm.log.log(Level.WARNING, "Couldn't parse $NAME: $valueStr", e)

                }

            }

            return null

        }

src/main/kotlin/at/bitfire/dav4jvm/property/MaxICalendarSize.kt

+8 −2
Original line number Diff line number Diff line
@@ -6,10 +6,12 @@ 


package at.bitfire.dav4jvm.property



import at.bitfire.dav4jvm.Dav4jvm

import at.bitfire.dav4jvm.Property

import at.bitfire.dav4jvm.PropertyFactory

import at.bitfire.dav4jvm.XmlUtils

import org.xmlpull.v1.XmlPullParser

import java.util.logging.Level



data class MaxICalendarSize(

        val maxSize: Long
@@ -23,8 +25,12 @@ data class MaxICalendarSize( 
        override fun getName() = NAME



        override fun create(parser: XmlPullParser): MaxICalendarSize? {

            XmlUtils.readText(parser)?.let {

                return MaxICalendarSize(it.toLong())

            XmlUtils.readText(parser)?.let { valueStr ->

                try {

                    return MaxICalendarSize(valueStr.toLong())

                } catch(e: NumberFormatException) {

                    Dav4jvm.log.log(Level.WARNING, "Couldn't parse $NAME: $valueStr", e)

                }

            }

            return null

        }

src/main/kotlin/at/bitfire/dav4jvm/property/MaxVCardSize.kt

+8 −2
Original line number Diff line number Diff line
@@ -6,10 +6,12 @@ 


package at.bitfire.dav4jvm.property



import at.bitfire.dav4jvm.Dav4jvm

import at.bitfire.dav4jvm.Property

import at.bitfire.dav4jvm.PropertyFactory

import at.bitfire.dav4jvm.XmlUtils

import org.xmlpull.v1.XmlPullParser

import java.util.logging.Level



data class MaxVCardSize(

        val maxSize: Long
@@ -23,8 +25,12 @@ data class MaxVCardSize( 
        override fun getName() = NAME



        override fun create(parser: XmlPullParser): MaxVCardSize? {

            XmlUtils.readText(parser)?.let {

                return MaxVCardSize(it.toLong())

            XmlUtils.readText(parser)?.let { valueStr ->

                try {

                    return MaxVCardSize(valueStr.toLong())

                } catch(e: NumberFormatException) {

                    Dav4jvm.log.log(Level.WARNING, "Couldn't parse $NAME: $valueStr", e)

                }

            }

            return null

        }

src/main/kotlin/at/bitfire/dav4jvm/property/QuotaAvailableBytes.kt

+8 −2
Original line number Diff line number Diff line
@@ -6,10 +6,12 @@ 


package at.bitfire.dav4jvm.property



import at.bitfire.dav4jvm.Dav4jvm

import at.bitfire.dav4jvm.Property

import at.bitfire.dav4jvm.PropertyFactory

import at.bitfire.dav4jvm.XmlUtils

import org.xmlpull.v1.XmlPullParser

import java.util.logging.Level



data class QuotaAvailableBytes(

        val quotaAvailableBytes: Long
@@ -23,8 +25,12 @@ data class QuotaAvailableBytes( 
        override fun getName() = NAME



        override fun create(parser: XmlPullParser): QuotaAvailableBytes? {

            XmlUtils.readText(parser)?.let {

                return QuotaAvailableBytes(it.toLong())

            XmlUtils.readText(parser)?.let { valueStr ->

                try {

                    return QuotaAvailableBytes(valueStr.toLong())

                } catch(e: NumberFormatException) {

                    Dav4jvm.log.log(Level.WARNING, "Couldn't parse $NAME: $valueStr", e)

                }

            }

            return null

        }