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

Commit 93307b64 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Minor refactoring; Kotlin update

parent a3fd1ac9

README.md

+14 −0
Original line number Diff line number Diff line
@@ -14,6 +14,20 @@ to your needs. 
Generated KDoc: https://bitfireAT.gitlab.io/dav4android/dokka/dav4android/





## Contact



```

bitfire web engineering – Stockmann, Hirner GesnbR

Florastraße 27

2540 Bad Vöslau, AUSTRIA

```



Email: [play@bitfire.at](mailto:play@bitfire.at) (do not use this)



For questions, suggestions etc. please use the DAVdroid forum:

https://www.davdroid.com/forums/





## License 



Copyright (C) bitfire web engineering (Ricki Hirner, Bernhard Stockmann).

build.gradle

+3 −8
Original line number Diff line number Diff line 


buildscript {

    ext.kotlin_version = '1.2.10'

    ext.kotlin_version = '1.2.21'

    ext.dokka_version = '0.9.15'



    repositories {

        jcenter()

        maven {

            url "https://maven.google.com"

        }

        google()

    }



    dependencies {
@@ -19,9 +17,7 @@ buildscript { 


repositories {

    jcenter()

    maven {

        url "https://maven.google.com"

    }

    google()

}



apply plugin: 'com.android.library'
@@ -59,7 +55,6 @@ dependencies { 
    compile 'com.squareup.okhttp3:okhttp:3.9.1'



    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.9.1'

    androidTestCompile 'junit:junit:4.12'

    androidTestCompile 'com.android.support.test:runner:1.0.1'



    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"

src/main/java/at/bitfire/dav4android/DavAddressBook.kt

+2 −4
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ class DavAddressBook @JvmOverloads constructor( 
        checkStatus(response, false)

        assertMultiStatus(response)



        members.clear()

        related.clear()

        resetMembers()

        response.body()?.charStream()?.use { processMultiStatus(it) }

    }
@@ -122,8 +121,7 @@ class DavAddressBook @JvmOverloads constructor( 
        checkStatus(response, false)

        assertMultiStatus(response)



        members.clear()

        related.clear()

        resetMembers()

        response.body()?.charStream()?.use { processMultiStatus(it) }

    }

src/main/java/at/bitfire/dav4android/DavCalendar.kt

+4 −5
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ class DavCalendar @JvmOverloads constructor( 


    companion object {

        @JvmField

        val MIME_ICALENDAR = MediaType.parse("text/calendar;charset=utf-8")

        val MIME_ICALENDAR = MediaType.parse("text/calendar")

        val MIME_ICALENDAR_UTF8 = MediaType.parse("text/calendar;charset=utf-8")

    }



    private val timeFormatUTC = SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'", Locale.US)
@@ -89,8 +90,7 @@ class DavCalendar @JvmOverloads constructor( 
        checkStatus(response, false)

        assertMultiStatus(response)



        members.clear()

        related.clear()

        resetMembers()

        response.body()?.charStream()?.use { processMultiStatus(it) }

    }
@@ -137,8 +137,7 @@ class DavCalendar @JvmOverloads constructor( 
        checkStatus(response, false)

        assertMultiStatus(response)



        members.clear()

        related.clear()

        resetMembers()

        response.body()?.charStream()?.use { processMultiStatus(it) }

    }

src/main/java/at/bitfire/dav4android/DavCollection.kt

+2 −3
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ open class DavCollection( 
        checkStatus(response, false)

        assertMultiStatus(response)



        members.clear()

        related.clear()

        resetMembers()

        response.body()?.charStream()?.use { processMultiStatus(it) }

    }