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

Unverified Commit c61e4b0c authored by Ricki Hirner's avatar Ricki Hirner
Browse files

ignore some invalid Long values; update gradle, kotlin

parent 587e8d5d

build.gradle.kts

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ group="com.github.bitfireAT" 
version="2.1.3"

version="2.1.3"





plugins {

plugins {

    kotlin("jvm") version "1.6.20"

    kotlin("jvm") version "1.7.0"

    `maven-publish`

    `maven-publish`





    id("org.jetbrains.dokka") version "1.5.0"

    id("org.jetbrains.dokka") version "1.5.0"

gradle/wrapper/gradle-wrapper.properties

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

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

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

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists
 
zipStorePath=wrapper/dists

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

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




package at.bitfire.dav4jvm.property

package at.bitfire.dav4jvm.property





import at.bitfire.dav4jvm.Dav4jvm

import at.bitfire.dav4jvm.Property

import at.bitfire.dav4jvm.Property

import at.bitfire.dav4jvm.PropertyFactory

import at.bitfire.dav4jvm.PropertyFactory

import at.bitfire.dav4jvm.XmlUtils

import at.bitfire.dav4jvm.XmlUtils

import org.xmlpull.v1.XmlPullParser

import org.xmlpull.v1.XmlPullParser

import java.util.logging.Level





data class GetContentLength(

data class GetContentLength(

        val contentLength: Long

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

        override fun getName() = NAME





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

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

            XmlUtils.readText(parser)?.let {

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

                return GetContentLength(it.toLong())

                try {

                    return GetContentLength(valueStr.toLong())

                } catch(e: NumberFormatException) {

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

                }

            }

            }

            return null

            return null

        }

        }

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

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




package at.bitfire.dav4jvm.property

package at.bitfire.dav4jvm.property





import at.bitfire.dav4jvm.Dav4jvm

import at.bitfire.dav4jvm.Property

import at.bitfire.dav4jvm.Property

import at.bitfire.dav4jvm.PropertyFactory

import at.bitfire.dav4jvm.PropertyFactory

import at.bitfire.dav4jvm.XmlUtils

import at.bitfire.dav4jvm.XmlUtils

import org.xmlpull.v1.XmlPullParser

import org.xmlpull.v1.XmlPullParser

import java.util.logging.Level





data class MaxICalendarSize(

data class MaxICalendarSize(

        val maxSize: Long

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

        override fun getName() = NAME





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

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

            XmlUtils.readText(parser)?.let {

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

                return MaxICalendarSize(it.toLong())

                try {

                    return MaxICalendarSize(valueStr.toLong())

                } catch(e: NumberFormatException) {

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

                }

            }

            }

            return null

            return null

        }

        }

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

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




package at.bitfire.dav4jvm.property

package at.bitfire.dav4jvm.property





import at.bitfire.dav4jvm.Dav4jvm

import at.bitfire.dav4jvm.Property

import at.bitfire.dav4jvm.Property

import at.bitfire.dav4jvm.PropertyFactory

import at.bitfire.dav4jvm.PropertyFactory

import at.bitfire.dav4jvm.XmlUtils

import at.bitfire.dav4jvm.XmlUtils

import org.xmlpull.v1.XmlPullParser

import org.xmlpull.v1.XmlPullParser

import java.util.logging.Level





data class MaxVCardSize(

data class MaxVCardSize(

        val maxSize: Long

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

        override fun getName() = NAME





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

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

            XmlUtils.readText(parser)?.let {

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

                return MaxVCardSize(it.toLong())

                try {

                    return MaxVCardSize(valueStr.toLong())

                } catch(e: NumberFormatException) {

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

                }

            }

            }

            return null

            return null

        }

        }