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

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

Add support for Property.Name in SupportedReportSet (#135)

- Change type of reports from Set<String> to Set<Property.Name>
- Update parsing logic to handle Property.Name objects
parent d1ba5b3a
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ import at.bitfire.dav4jvm.XmlReader
import org.xmlpull.v1.XmlPullParser

data class SupportedReportSet(
    val reports: Set<String> = emptySet()
    val reports: Set<Property.Name> = emptySet()
): Property {

    object Factory: PropertyFactory {
@@ -29,14 +29,13 @@ data class SupportedReportSet(
               <!ELEMENT report ANY>
            */

            val reports = mutableSetOf<String>()
            val reports = mutableSetOf<Property.Name>()

            XmlReader(parser).processTag(WebDAV.SupportedReport) {
                processTag(WebDAV.Report) {
                    parser.nextTag()
                    if (parser.eventType == XmlPullParser.TEXT)
                        reports += parser.text
                    else if (parser.eventType == XmlPullParser.START_TAG)
                        reports += "${parser.namespace}${parser.name}"
                    if (parser.eventType == XmlPullParser.START_TAG)
                        reports += Property.Name(parser.namespace, parser.name)
                }
            }
            return SupportedReportSet(reports)