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

Unverified Commit bcb30026 authored by Ricki Hirner's avatar Ricki Hirner Committed by GitHub
Browse files

Remove remaining redundant property names (#129) 

* Remove remaining redundant property names

* Fix tests

* Fix tests (2)
parent 37164528

src/main/kotlin/at/bitfire/dav4jvm/Error.kt

+0 −9
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


package at.bitfire.dav4jvm



import at.bitfire.dav4jvm.property.webdav.WebDAV

import org.xmlpull.v1.XmlPullParser

import java.io.Serializable
@@ -28,8 +27,6 @@ data class Error( 


    companion object {



        val NAME = Property.Name(WebDAV.NS_WEBDAV, "error")



        fun parseError(parser: XmlPullParser): List<Error> {

            val names = mutableSetOf<Property.Name>()
@@ -44,12 +41,6 @@ data class Error( 
            return names.map { Error(it) }

        }





        // some pre-defined errors



        val NEED_PRIVILEGES = Error(Property.Name(WebDAV.NS_WEBDAV, "need-privileges"))

        val VALID_SYNC_TOKEN = Error(Property.Name(WebDAV.NS_WEBDAV, "valid-sync-token"))



    }



    override fun equals(other: Any?) =

src/main/kotlin/at/bitfire/dav4jvm/ktor/PropStat.kt

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ data class PropStat( 


    companion object {



        @JvmField

        val NAME = Property.Name(WebDAV.NS_WEBDAV, "propstat")



        private val ASSUMING_OK = HttpStatusCode(200, "Assuming OK")



        fun parse(parser: XmlPullParser): PropStat {

src/main/kotlin/at/bitfire/dav4jvm/ktor/Response.kt

+2 −2
Original line number Diff line number Diff line
@@ -161,9 +161,9 @@ data class Response( 
                        }

                        WebDAV.Status ->

                            status = KtorHttpUtils.parseStatusLine(parser.nextText())

                        PropStat.NAME ->

                        WebDAV.PropStat ->

                            PropStat.parse(parser).let { propStat += it }

                        Error.NAME ->

                        WebDAV.Error ->

                            error = Error.parseError(parser)

                        WebDAV.Location ->

                            newLocation = Url(parser.nextText())    // TODO: Need to catch exception here?

src/main/kotlin/at/bitfire/dav4jvm/ktor/exception/HttpResponseInfo.kt

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import at.bitfire.dav4jvm.XmlUtils 
import at.bitfire.dav4jvm.XmlUtils.propertyName

import at.bitfire.dav4jvm.ktor.isText

import at.bitfire.dav4jvm.ktor.isXml

import at.bitfire.dav4jvm.property.webdav.WebDAV

import io.ktor.client.statement.HttpResponse

import io.ktor.client.statement.bodyAsChannel

import io.ktor.client.statement.request
@@ -113,7 +114,7 @@ internal class HttpResponseInfo private constructor( 
                var eventType = parser.eventType

                while (eventType != XmlPullParser.END_DOCUMENT) {

                    if (eventType == XmlPullParser.START_TAG && parser.depth == 1)

                        if (parser.propertyName() == Error.NAME)

                        if (parser.propertyName() == WebDAV.Error)

                            return Error.parseError(parser)

                    eventType = parser.next()

                }

src/main/kotlin/at/bitfire/dav4jvm/okhttp/Response.kt

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ data class Response( 
                            }

                        WebDAV.PropStat ->

                            PropStat.parse(parser).let { propStat += it }

                        Error.NAME ->

                        WebDAV.Error ->

                            error = Error.parseError(parser)

                        WebDAV.Location ->

                            newLocation = parser.nextText().toHttpUrlOrNull()